Address formatting concerns

* Removed self-closing tags
* Move the the nested divs into variables
* Expand the object literals for easier reading