Adapted to new key handling.

Also use a more responsive top menu.