modified layout a bit