Improve menu behavior.
Use improved menu in sailfish version as well.