Fix layout and DB

q