[tor-commits] [community/staging] Edit model and block plus templates. Layout is maybe a reserved field?