Removed the need for a file per layout