Updated foreach and model binding to not nest already-wrapped item