move round selection from layout to index
add Size and price to Size and Extra
test fixtures