diff --git a/ivette/src/frama-c/plugins/eva/style.css b/ivette/src/frama-c/plugins/eva/style.css
index 86685b4e842d53e32432a8f1a4f3aebd98958e15..e4b278bb6a36a87891ef7064b38d05c3a4bcdfab 100644
--- a/ivette/src/frama-c/plugins/eva/style.css
+++ b/ivette/src/frama-c/plugins/eva/style.css
@@ -167,6 +167,10 @@
   border-right: thin solid var(--border);
 }
 
+.eva-table-container {
+  overflow: auto;
+}
+
 /* -------------------------------------------------------------------------- */
 /* --- Table Headers CSS                                                  --- */
 /* -------------------------------------------------------------------------- */
@@ -269,5 +273,7 @@ tr:first-of-type > .eva-table-callsite-box {
 /* -------------------------------------------------------------------------- */
 
 .eva-functions-section {
-  overflow-y: auto;
+  display: grid;
+  overflow: auto;
+  align-content: start;
 }
diff --git a/ivette/src/frama-c/plugins/eva/valuetable.tsx b/ivette/src/frama-c/plugins/eva/valuetable.tsx
index 57eae580b6cd5f46e14f6fb083f3043685a0407e..88dc90eea930ac5f8b10ff945d6b3a625ef12c83 100644
--- a/ivette/src/frama-c/plugins/eva/valuetable.tsx
+++ b/ivette/src/frama-c/plugins/eva/valuetable.tsx
@@ -423,7 +423,6 @@ interface ProbeValuesProps {
   addLoc: (loc: Location) => void;
   isSelected: boolean;
   summaryOnly: boolean;
-  // selectedClass?: string;
 }
 
 function ProbeValues(props: ProbeValuesProps): Request<callstack, JSX.Element> {
@@ -487,8 +486,6 @@ function ProbeValues(props: ProbeValuesProps): Request<callstack, JSX.Element> {
 
 
 
-
-
 interface FunctionProps {
   fct: string;
   markers: Map<Ast.marker, MarkerStatus>;
@@ -568,7 +565,7 @@ async function FunctionSection(props: FunctionProps): Promise<JSX.Element> {
   }));
 
   return (
-    <div key={fct}>
+    <>
       <Hpack className="eva-function">
         <IconButton
           className="eva-fct-fold"
@@ -592,7 +589,7 @@ async function FunctionSection(props: FunctionProps): Promise<JSX.Element> {
           onClick={close}
         />
       </Hpack>
-      <div style={{ overflowX: 'auto' }}>
+      <div className='eva-table-container'>
         <table className='eva-table' style={{ display: displayTable }}>
           <tbody>
             <tr>
@@ -611,7 +608,7 @@ async function FunctionSection(props: FunctionProps): Promise<JSX.Element> {
           </tbody>
         </table>
       </div>
-    </div>
+    </>
   );
 }
 
@@ -868,9 +865,9 @@ function EvaTable(): JSX.Element {
         state={state}
         setState={setState}
       />
-      <Vfill className='eva-functions-section'>
+      <div className='eva-functions-section'>
         {React.Children.toArray(functions)}
-      </Vfill>
+      </div>
       {alarmsInfos}
       {stackInfos}
     </>