Stock Toolbar integration

Stock toolbar integration & some GUI code reorganization