more style changes and fixing of things
Merge branch 'master' of https://github.com/lamthuyvo/happy-here