UI Bug fixed