Refactor

Nick --

I refactored your site a bit. Let me know what you think. You can merge this pull request (which would overwrite your version on github) and then run `git pull` to get it on your computer. Or you can just read the code