VE-870 Apply CSS class in more appropriate place