Changed ViewBuilder to Layout