Revert "Forms layout modified and created new as well."

This reverts commit 4f596790b065189084103b902564633780e291eb.
Form-Extend Re Committed

Have followed all your instructions and have removed the snap use to.
Please check and make me aware further.