Changed the retrieval of layout items to a fast query and added a layer of caching in