Cleanup + small changes to the GUI