Working navigation

All navigation hooked up and improved styling