[ORB-15] refactored contact create/edit form and fixed some bugs