Refactor
Renamed ui file
UI improvements
UI improvements