UI changes and minor bug fixes