update some style and bug fix
l
Merge branch 'master' of https://github.com/HackathonLV/HackathonWeekend