UI Changes and Optimization