toolbar fix 1