Added navbar logic