Updated the Map Attachment control

using the same logic as regular attachmnet to avoid nesting forms.