Cleaning up after attachments
Fix for attachments
Some cleanup
Detail views