added new toolbar template
merged with origin