changed UX

minor UX fixes
Merge branch 'master' of https://github.com/EnriqueRE/project-sobek

Conflicts:
	Water_Automation/FieldApp/views.py