migrated frontend layout
temporary layout
Merge branch 'Ren'
DB update