Added basic navigation

Also made some minor tweaks