Subtle layout changes to make it consisten