new layout and DB implementation