Fixed the UI and Route issue