Tweaked navbar button highlighting functionality