Move opt-in controls to above calling button
Move opt-in controls to above calling button

matinieves/advocacycommons,advocacycommons/advocacycommons,agustinrhcp/advocacycommons,advocacycommons/advocacycommons,agustinrhcp/advocacycommons,matinieves/advocacycommons,advocacycommons/advocacycommons,matinieves/advocacycommons,agustinrhcp/advocacycommons