Made some refactorings to edit contact info and demographics pages and controllers