toolbar view update
Merge branch 'toolbarv1.3'