Rearranged a few things, cleaned up some code
Some CSS and menu cleanup