ui changes and bug fixes