Rearranged things, added navbar (WIP), see description

I started using a new app for arranging the html at this point, so that
I format the HTML appropriately.