improved navigation, settings page