Add home button to bottom navbar
Change logout button icon
Merge remote-tracking branch 'origin/master'