Polish to the GUI app