Fix toolbar issue