Add toolbar support
Update demo project to take advantage of toolbar