modified layout
completed layout