Cleanup: switched to div as a wrapping tag

This was also preventing from using properly block elements inside.
Cleanup: use self-closing tag
Cleanup: minor