Lots of updates, both to CSS, connections, and templates