working on the agenda view and map