Minor GUI fixes and refactoring.