update bottom bar, some bug fixes
Merge branch 'master' of https://github.com/HackathonLV/HackathonWeekend