Fixed Departments design and function