diff --git a/imports/ui/consultations/ConsultationForm.tsx b/imports/ui/consultations/ConsultationForm.tsx
index 9faa47f69..a6d05af51 100644
--- a/imports/ui/consultations/ConsultationForm.tsx
+++ b/imports/ui/consultations/ConsultationForm.tsx
@@ -14,6 +14,7 @@ import WarningIcon from '@mui/icons-material/Warning';
 import LinkIcon from '@mui/icons-material/Link';
 import LinkOffIcon from '@mui/icons-material/LinkOff';
 import BlockIcon from '@mui/icons-material/Block';
+import Typography from '@mui/material/Typography';
 
 import CircularProgress from '@mui/material/CircularProgress';
 
@@ -50,10 +51,9 @@ const StyledPaper = styled(Paper)(({theme}) => ({
 	padding: theme.spacing(3),
 }));
 
-const TextArea = styled(TextField)(({theme}) => ({
-	margin: theme.spacing(1),
+const TextArea = styled(TextField)(() => ({
 	overflow: 'auto',
-	width: `calc(100% - ${theme.spacing(2)})`,
+	width: '100%',
 }));
 
 const defaultDate = '1970-01-01';
@@ -164,225 +164,242 @@ const ConsultationForm = ({consultation, update}: Props) => {
 	const consultationYear = getYear(datetime);
 
 	return (
-		<StyledPaper>
-			<Grid container spacing={3}>
-				<Grid item xs={12}>
-					<TextArea
-						multiline
-						readOnly={!update}
-						autoFocus={Boolean(update)}
-						label="Motif de la visite"
-						placeholder="Motif de la visite"
-						rows={4}
-						value={reason}
-						margin="normal"
-						onChange={update?.('reason')}
-					/>
-				</Grid>
-				<Grid item xs={12}>
-					<TextArea
-						multiline
-						readOnly={!update}
-						label="Examens déjà réalisés"
-						placeholder="Examens déjà réalisés"
-						rows={4}
-						value={done}
-						margin="normal"
-						onChange={update?.('done')}
-					/>
-				</Grid>
-				<Grid item xs={12}>
-					<TextArea
-						multiline
-						readOnly={!update}
-						label="Examens à réaliser"
-						placeholder="Examens à réaliser"
-						rows={4}
-						value={todo}
-						margin="normal"
-						onChange={update?.('todo')}
-					/>
-				</Grid>
-				<Grid item xs={12}>
-					<TextArea
-						multiline
-						readOnly={!update}
-						label="Traitement"
-						placeholder="Traitement"
-						rows={4}
-						value={treatment}
-						margin="normal"
-						onChange={update?.('treatment')}
-					/>
-				</Grid>
-				<Grid item xs={12}>
-					<TextArea
-						multiline
-						readOnly={!update}
-						label="À revoir"
-						placeholder="À revoir"
-						rows={4}
-						value={next}
-						margin="normal"
-						onChange={update?.('next')}
-					/>
-				</Grid>
-				<Grid item xs={12}>
-					<TextArea
-						multiline
-						readOnly={!update}
-						label="Autres remarques"
-						placeholder="Write some additional information about the consultation here"
-						rows={4}
-						value={more}
-						margin="normal"
-						onChange={update?.('more')}
-					/>
-				</Grid>
-
-				<Grid item xs={1}>
-					<TextField
-						fullWidth
-						select
-						readOnly={!update}
-						label="Currency"
-						value={currency}
-						margin="normal"
-						onChange={update?.('currency')}
-					>
-						<MenuItem value="EUR">€</MenuItem>
-					</TextField>
-				</Grid>
-				<Grid item xs={2}>
-					<TextField
-						fullWidth
-						select
-						readOnly={!update}
-						label="Payment Method"
-						value={payment_method}
-						margin="normal"
-						onChange={update?.('payment_method')}
-					>
-						<MenuItem value="cash">cash</MenuItem>
-						<MenuItem value="wire">virement</MenuItem>
-						<MenuItem value="third-party">tiers payant</MenuItem>
-					</TextField>
-				</Grid>
-				<Grid item xs={3}>
-					<TextField
-						fullWidth
-						readOnly={!update}
-						label="Prix"
-						value={priceString}
-						margin="normal"
-						error={priceError}
-						InputProps={{
-							endAdornment: (
-								<InputAdornment position="end">
-									<IconButton
-										size="large"
-										sx={priceWarning ? undefined : {display: 'none'}}
-									>
-										<WarningIcon />
-									</IconButton>
-								</InputAdornment>
-							),
-							inputComponent: CurrencyAmountInput as any,
-							inputProps: {currency},
-						}}
-						onChange={update?.('priceString')}
-					/>
-				</Grid>
-				<Grid item xs={3}>
-					<TextField
-						fullWidth
-						readOnly={!update}
-						label="Payé"
-						value={paidString}
-						margin="normal"
-						error={paidError}
-						InputProps={{
-							endAdornment: (
-								<InputAdornment position="end">
-									<IconButton size="large">
-										{syncPaid ? <LinkIcon /> : <LinkOffIcon />}
-									</IconButton>
-								</InputAdornment>
-							),
-							inputComponent: CurrencyAmountInput as any,
-							inputProps: {currency},
-						}}
-						onChange={update?.('paidString')}
-					/>
-				</Grid>
-				<Grid item xs={2}>
-					{update ? (
-						<AutocompleteWithSuggestions
-							itemToString={(x) => (x ? x.bookNumber : '')}
-							useSuggestions={makeSubstringSuggestions(
-								useBooksFind,
-								[],
-								'bookNumber',
-								{fiscalYear: consultationYear},
+		<Grid container spacing={3}>
+			<Grid item xs={12}>
+				<StyledPaper>
+					<Grid container spacing={3}>
+						<Grid item xs={12}>
+							<TextArea
+								multiline
+								readOnly={!update}
+								autoFocus={Boolean(update)}
+								label="Motif de la visite"
+								placeholder="Motif de la visite"
+								rows={4}
+								value={reason}
+								margin="normal"
+								onChange={update?.('reason')}
+							/>
+						</Grid>
+						<Grid item xs={12}>
+							<TextArea
+								multiline
+								readOnly={!update}
+								label="Examens déjà réalisés"
+								placeholder="Examens déjà réalisés"
+								rows={4}
+								value={done}
+								margin="normal"
+								onChange={update?.('done')}
+							/>
+						</Grid>
+						<Grid item xs={12}>
+							<TextArea
+								multiline
+								readOnly={!update}
+								label="Examens à réaliser"
+								placeholder="Examens à réaliser"
+								rows={4}
+								value={todo}
+								margin="normal"
+								onChange={update?.('todo')}
+							/>
+						</Grid>
+						<Grid item xs={12}>
+							<TextArea
+								multiline
+								readOnly={!update}
+								label="Traitement"
+								placeholder="Traitement"
+								rows={4}
+								value={treatment}
+								margin="normal"
+								onChange={update?.('treatment')}
+							/>
+						</Grid>
+						<Grid item xs={12}>
+							<TextArea
+								multiline
+								readOnly={!update}
+								label="À revoir"
+								placeholder="À revoir"
+								rows={4}
+								value={next}
+								margin="normal"
+								onChange={update?.('next')}
+							/>
+						</Grid>
+						<Grid item xs={12}>
+							<TextArea
+								multiline
+								readOnly={!update}
+								label="Autres remarques"
+								placeholder="Write some additional information about the consultation here"
+								rows={4}
+								value={more}
+								margin="normal"
+								onChange={update?.('more')}
+							/>
+						</Grid>
+					</Grid>
+				</StyledPaper>
+			</Grid>
+			<Grid item xs={12}>
+				<StyledPaper>
+					<Typography variant="h6">Payment</Typography>
+					<Grid container spacing={3}>
+						<Grid item xs={3}>
+							<TextField
+								fullWidth
+								select
+								readOnly={!update}
+								label="Currency"
+								value={currency}
+								margin="normal"
+								onChange={update?.('currency')}
+							>
+								<MenuItem value="EUR">€</MenuItem>
+							</TextField>
+						</Grid>
+						<Grid item xs={3}>
+							<TextField
+								fullWidth
+								select
+								readOnly={!update}
+								label="Payment Method"
+								value={payment_method}
+								margin="normal"
+								onChange={update?.('payment_method')}
+							>
+								<MenuItem value="cash">cash</MenuItem>
+								<MenuItem value="wire">virement</MenuItem>
+								<MenuItem value="third-party">tiers payant</MenuItem>
+							</TextField>
+						</Grid>
+						<Grid item xs={3}>
+							<TextField
+								fullWidth
+								readOnly={!update}
+								label="Prix"
+								value={priceString}
+								margin="normal"
+								error={priceError}
+								InputProps={{
+									endAdornment: (
+										<InputAdornment position="end">
+											<IconButton
+												size="large"
+												sx={priceWarning ? undefined : {display: 'none'}}
+											>
+												<WarningIcon />
+											</IconButton>
+										</InputAdornment>
+									),
+									inputComponent: CurrencyAmountInput as any,
+									inputProps: {currency},
+								}}
+								onChange={update?.('priceString')}
+							/>
+						</Grid>
+						<Grid item xs={3}>
+							<TextField
+								fullWidth
+								readOnly={!update}
+								label="Payé"
+								value={paidString}
+								margin="normal"
+								error={paidError}
+								InputProps={{
+									endAdornment: (
+										<InputAdornment position="end">
+											<IconButton size="large">
+												{syncPaid ? <LinkIcon /> : <LinkOffIcon />}
+											</IconButton>
+										</InputAdornment>
+									),
+									inputComponent: CurrencyAmountInput as any,
+									inputProps: {currency},
+								}}
+								onChange={update?.('paidString')}
+							/>
+						</Grid>
+					</Grid>
+				</StyledPaper>
+			</Grid>
+			<Grid item xs={12}>
+				<StyledPaper>
+					<Typography variant="h6">Accounting</Typography>
+					<Grid container spacing={3}>
+						<Grid item xs={6}>
+							{update ? (
+								<AutocompleteWithSuggestions
+									itemToString={(x) => (x ? x.bookNumber : '')}
+									useSuggestions={makeSubstringSuggestions(
+										useBooksFind,
+										[],
+										'bookNumber',
+										{fiscalYear: consultationYear},
+									)}
+									TextFieldProps={{
+										label: 'Carnet',
+										margin: 'normal',
+										error: bookIsFull,
+										helperText: bookIsFull && 'Check if book is full!',
+									}}
+									InputProps={{
+										endAdornment: bookIsFull && <WarningIcon />,
+									}}
+									inputValue={book}
+									onInputChange={(event, newInputValue) => {
+										if (event) {
+											update(
+												'book',
+												books.sanitizeInput,
+											)({target: {value: newInputValue}});
+										}
+									}}
+								/>
+							) : (
+								<TextField readOnly label="Carnet" value={book} margin="normal" />
 							)}
-							TextFieldProps={{
-								label: 'Carnet',
-								margin: 'normal',
-								error: bookIsFull,
-								helperText: bookIsFull && 'Check if book is full!',
-							}}
-							InputProps={{
-								endAdornment: bookIsFull && <WarningIcon />,
-							}}
-							inputValue={book}
-							onInputChange={(event, newInputValue) => {
-								if (event) {
-									update(
-										'book',
-										books.sanitizeInput,
-									)({target: {value: newInputValue}});
+						</Grid>
+						<Grid item xs={6}>
+							<TextField
+								fullWidth
+								disabled={inBookNumberDisabled}
+								readOnly={!update}
+								label="N°"
+								value={inBookNumberString}
+								margin="normal"
+								error={
+									!inBookNumberDisabled &&
+									(inBookNumberError || inBookNumberCollides)
 								}
-							}}
-						/>
-					) : (
-						<TextField readOnly label="Carnet" value={book} margin="normal" />
-					)}
-				</Grid>
-				<Grid item xs={1}>
-					<TextField
-						fullWidth
-						disabled={inBookNumberDisabled}
-						readOnly={!update}
-						label="N°"
-						value={inBookNumberString}
-						margin="normal"
-						error={
-							!inBookNumberDisabled &&
-							(inBookNumberError || inBookNumberCollides)
-						}
-						helperText={inBookNumberCollides && 'Collision'}
-						InputProps={{
-							endAdornment: (
-								<InputAdornment position="end">
-									<IconButton size="large">
-										{loadingInBookNumber ? (
-											<CircularProgress color="inherit" size={20} />
-										) : inBookNumberDisabled ? (
-											<BlockIcon />
-										) : syncInBookNumber ? (
-											<LinkIcon />
-										) : (
-											<LinkOffIcon />
-										)}
-									</IconButton>
-								</InputAdornment>
-							),
-						}}
-						onChange={update?.('inBookNumberString')}
-					/>
-				</Grid>
+								helperText={inBookNumberCollides && 'Collision'}
+								InputProps={{
+									endAdornment: (
+										<InputAdornment position="end">
+											<IconButton size="large">
+												{loadingInBookNumber ? (
+													<CircularProgress color="inherit" size={20} />
+												) : inBookNumberDisabled ? (
+													<BlockIcon />
+												) : syncInBookNumber ? (
+													<LinkIcon />
+												) : (
+													<LinkOffIcon />
+												)}
+											</IconButton>
+										</InputAdornment>
+									),
+								}}
+								onChange={update?.('inBookNumberString')}
+							/>
+						</Grid>
+					</Grid>
+				</StyledPaper>
 			</Grid>
-		</StyledPaper>
+		</Grid>
 	);
 };