More changes to support layout for Virtual Library