Improve caffeine manager navigation