Navbar and Layout

Added a navbar and made some minor layout changes.