fix layouts and scripts
Merge branch 'layout' of https://github.com/shinsenter/labellevn-design into layout