Remove hot keys and improve text