Updated theme work from Jon
Visual amends
Last styling issues