Now works with non-image assets.  Cleaner UI.