Fix initialization of toolbar