Switched off animation
nothing much
Single toolbar
Fixed template case
Merged into master