Further changes to actionmode and keyboard input