Minor UI Changes and refactoring