Added assocations for user and contacts, and updated contact forms