Fixed menu bug, added support for 2.x