removed the double call to the DB, change navbar