UI Changes 2 - Routing Issues.