Better GUI logic