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, and should have been removed.
This is invalid CSS. @zberkom It probably got in here because of the conflict that you resolved. You need to remove this stuff when you're fixing a conflict.