FIXES DCA-1142 putting the expand collapse buttons into the tab order