Minor GUI fixes and cleanup

Again, self-explanatory