update templates layout
update templates layout
Merge branch 'authorization'
Merge branch 'layout'