Navigation Improvements and Tracks UI Update