Moving more presentation logic to the presenters