Fix toolbar loading