Improved menu generation + change order.