Code-cleaning
UI improvements