Added menu items support & some stuff to work around it