[WIP] New properties layout