extension rework & menu