Fix the alignment and ordering of the person_override_active

https://www.pivotaltracker.com/story/show/40773995