Serious UI facelift

Plus removal of lots of dead code