Refactoring presenters

updated the presenters to use the new mapper.