BZ-11961 Style updates