layout modified. bug fix.
Merge branch 'front-theme1'