Polishing up the GUI

Part 1
Polishing up the GUI

Part 2