Updated look

Improved the look of the site and rearranged code to make sure
everything still works.