Switched to wall based layout from blocks