#1641 | Close popup when navigated to other page, Remove image from gallery when image is removed