Reorganize the styles a bit