Updated layout with people's suggestions