Update menu logic
Simplify synthesis