removed Menu from singleton to a member of Application #1846