With nav-bar implemented`