Combine standalone display and upload widget into working entity browser.

This seems strange