Add new template.  Refactor options display.
Merge.  Fixes for full width post format template.