fix to menu items
clean up the files and update the plugin functions