fix layouts and css
Merge branch 'master' of https://github.com/quan32/ITJ