Sorry I was working on the branch. This is the final changes
Before it was
Now it renders like this
If you have any comments I can modify it.