fixed some views

and refactored DepartmentModel to Department