menu system refined
fixed conflicts