First upload

Back to normal Toolbar (instead of Javascript). Still requires cleaning
and normalizing.