Style and helper updates