Re-enabled Submenus and added input boxes