Refactoring presenters and merging new changes