Add org-agenda setting and re-factoring