ported the styles added from the comment branch over