Make navbar more better