Made output easier to override.  Added alternate layouts, new date display option.