modified layout and spacing