Tons of reorg mainly
Various bits of styling