adding some layout stuff and database structure