keep C::B layout out of repo
fix toolbar initialization