Improved navigation and Lineup page