Add custom toolbar extension

refactor to extension