Added new navigation, minor changes