layout and database changes