sua layout
Merge branch 'fix-layout-chuong-22102013'
sg