UI Changes and beginning of refactoring