main-menu fix; cleanup.