General toolbar markup
Merge branch 'pr-5'