Improve timer in KeyLocationPanel as well