styles and template changes for #1807
0.0.84