Bug fixed
UI cosmetics