Move submit in macro