Redesign

At the moment this is what I'm going to be sticking with. I'm not completely happy yet, and I have to dig through fiddly bits of code to change a few things, but I do like it overall.