Cleanup and addition of armed service status to parent forms

Branch originally started as cleanup, but I forgot to switch branches before I committed the armed service status work.