Bug fixes, added callbacks to payloads
Moved menus into individual module files