+ Minor changes to GUI structure