fix navigation bar for mobile
fix the base dao
Merge pull request #1 from ajohnson-echo360/fix_base_dao

Fix base dao