Making menus more feature-complete