improved usability for contacts form
changed context to local context
fixed merge conflicts
fixed merge conflicts