Working on DB, adjusting Layout