Merge pull request #680 from Arantor/release-2.1

! A bit more clean-up of the attachments page. I think I'm done for now ...