Improved navigation, added functionality to navigate back through group selection