Minor UI changes and bug fixes