Lots of restructuring, new fresh GUI