Added more menu type functionality