add choose buttons, untracked unit-cache