db and layout changes