Add department to overview

+ Fixed bug where role wouldn't show after adding a user
Merge failure fix