some changes
UI improvements