LayoutStorage is now a singleton