Reorganize styling a little

Otherwise it's too hard to read.