Allow `property` fron source tags
Fix layout bug