Small refinements to the GUI controls