Fix more HH7 issues
More HH7 styling