Refactor Assignment UI