UI changes and bug fixes