Refactored menu system #154.