Small refactor to move some code from the Unit View to the KQ View