Added menu support for all OSes