Always order by menu order (ascending).  This might fix #1.