Major GUI Cleanup



Reviewed by: Simon
Merge origin/master