Implemented full support with menus.
Some cleaning remains.