Fix the style issues caused by UX code change