fix menu order
some fixes
fixes