re-organized custom-agenda menu