Swapped to MenuLayer. Updated to use the latest API changes.