Fixed info page navigation, cleaned up code