New layout and database changes