Restructured form layout