More cleaning of the updated GUI