Re-factor attachments to be responsive