Fixing a few issues in the css and making the navigation part of the class.