Simplified the form layout.