Pickiness
Block layout complete, minor style updates