Pulled stuff out of standard into base class.  Some styling.