Minor GUI refactor.