Better navigation, user input, and cleaner code