Initial rework with John's styles
Additional temp improvements to styles