Ray/simpler composite presenter

A change of changes that simplify the presenter and popup APIs, drop some unused code, and fix a bug in Presenter.