re-added navbar with proper functioning