UI Changes and bug fixes