Refactor Layer::Presenter