fix layout
Merge branch 'develop' of https://github.com/dinhtuan0108/offshore_thucpham into develop