added support for menu, and interaction with menu