Ui changes and bug fixes