Fixing the form layout