V0.06A Layout Test

Some more changes