Basic front-end layout
Merge branch 'bsic-layout'

Merging basic layout to master.