Yet more GUI crap
Yet more GUI crappy code
Refactoring
Checkpoint GUI commit