fixed bugs with menus and add()
fixed conflicts