avoid use empty elements

[fellyph]

Some parts of the code has empty p and ul, avoid add those items if they are not necessary

line 40:
<p></p>