Tweak department forms and add edit functionality
Merge branch 'release/0.0.9'