Merge pull request #56 from darabun/feat/bottom-tabs

Clean up bottom tabs
Fix bottom bar issue for Android