case-3407 - Additional style changes