Fix Nav bar and database