A bit of css reorg