Improve formatting of HTML, CSS

This PR will fix #11. We have some redundant CSS rules, HTML that needs better tabbing, and some artifacts that came from a conflict which should have been removed.