More work on desktop menu system.