Began integration of navbar