Revert "Add User Form Layout"

This reverts commit e7734da5ce3f06411d760e134a3f848b26eab69f.