fix messenger & toggles