Moved to buttons for navigation