Adjusted form layout