Revert "Revert "Form design""

This reverts commit 0addccddb1e96a927057dd372d2021c8f7fc1eb6.