Bug fixed
Changes on UI