Ui changes : minor mistakes and Cursor waiting!