Minor design changes
Merge branch 'master' of https://github.com/FlipFlopWeekly/zori
Merge branch 'master' of https://github.com/FlipFlopWeekly/zori
Fix firebase issue