changes related to attachment and form modal