Various UI Changes and removal of un-needed redirect route