Adding toolbox as a view and decoupling model logic