More consistent layout