Polishing up the GUI

Part 6