Cleared up more 2.2 styling issues