More consistent grid layout
Refining the visual layout