Reorganized navigation, added little barrier