finalized work on the navbar