Added navbar cleanup