layout updates, allowed for no db