Various style and layout changes plus a few new graphics