A bunch of improvements to key lookup modal