Combine standalone display and upload widget into working entity browser.

This is temporary code (subject to change :)), but you are right.