Refinements for the GUI