UI Bug fixed
Bug fix