ui fix and department fix