Refactor the way toolbox view is drawn, support switching between sports