Revert "Revert "Updated: Form moved""

This reverts commit b44166ac9dd39497ac6a0e1ebcc6502bed11755c.