fix layout
fix some bugs
Merge branch 'master' of https://github.com/nghe-tc/nguoisaigon