Adding new menu interaction, other cleanup.