rename desugar and improve menus