Fixed toolbox view
Removed context