Bump versions
Fix layout creation