Minor UI changes
Several bug fixes and minor improvements.