Fixed some basic navigation with departments