Continue fix draw toolbar bugs