use more consistent layout