Fixed Agenda list + others stuffs