fixes multiple assets coming up and adds X to remove them
Merge branch 'bugs/multiple_assets_add_and_remove' into development