Bug fixes and UI cleanup

Close issue #1101.
Includes UI changes from PR #1109.