UI Changes and Comments

UI Changes and Comments