UPDATE
split in agency
remove blank entity
UPDATE
edit main layouts