Last commit with ConditionalLayouts
Reverted back to hackish layouts that work