fix logic bug and regenerate style