merged Dan's work

Next step: merge toolbar into main scene.