There's no reason to separate auto-combat from the other combat related choices. It was fine the previous way, even if with changed position. Combat related together, gathering related together.