Massive UI hacking and slashing...  (still a W.I.P.)