agendas/views refatoring. let it pass the test