Clean up ui-menu.c