Markup wrap-up, markup wrap-uuuuuup!
Removed commented out js
Style changes to complement the markup update
Compiled css