Minor fixes in initial layout
Basic assertions for PropertyContainer.