Make menus more extensible

Change-Id: I964a54f63b62feacaa41190a6980b7cc02b61e27