WM: Image link to 404 page; closes #517
WM: Cleanup