Improve the keys navigation