App: remove modal
Work: restore grid
Work_page: update crop
Water: update
App: Remove activeRoute
Implement new activeTab method
Merge