clean up code
order by menu_order, then by id