Added the Toolbox for better User Experience