Updated layout to bind v0.2.1