fixed ugly toolbar, etc