fixed toggles and Main