finished work on navbar