Clean up menu & menu item API functions for presets

#3307 

Clean up and possible rework