Add new toolbar options

Modify build
Add support for custom attributes