Lots of changes to GUI