AutomationEditor.cpp Consistency Changes

Updates AutomationEditor to be more consistent with master.