Redesign

I think it's ready! @nquinlan can you take a look?