Add back custom fields and improve edit media form

* adds back custom fields to the other section
* Only show water media fields if the media is a member of the water media feed
* Fixes some validity, accessibility and other problems
Other what? This probably isn't the best context label.