Presenter -> Controller, improved routing