Added toolbox controls and other updates.