UI Changes and minor code cleanup