Placed primary fieldset for contact seperate from the form

Change-Id: I98b97cc1669d9047ad4c400945867541be6f881b