Tweaking some of the class output and styling