Layout now is disconnected from store_id