Combine standalone display and upload widget into working entity browser.

Yeah... We don't have any UI yet. Will add a @TODO.