[OnDemand] tweak main menu, also tweak the list.