bug fixed
UI improvements