Bug fixed
UI improvements
UI improvements