basic layout and database fix