v0.06B Layout Test

Another batch of changes.