Free to merge

**Edit visit still doesn't work**
Added new form for edit visit