diff --git a/src/lib/ManageFilesModal.svelte b/src/lib/ManageFilesModal.svelte
index 77d261e..fdc5af2 100644
--- a/src/lib/ManageFilesModal.svelte
+++ b/src/lib/ManageFilesModal.svelte
@@ -55,9 +55,13 @@
         { label: 'Solution checkers', files: checkers },
         { label: 'Other files', files: other },
     ].filter((s) => s.files.length > 0);
+
+    function accept() {
+        dispatch('close');
+    }
 </script>
 
-<Modal {active} title="Manage files" on:cancel={() => dispatch('close')}>
+<Modal {active} title="Manage files" on:submit={accept} on:cancel={accept}>
     {#each sections as section}
         <p>{section.label}</p>
         <table class="table is-fullwidth">
@@ -75,6 +79,7 @@
                                             : 'hide'} this file"
                                         class:is-primary={!file.hidden}
                                         class:is-light={file.hidden}
+                                        type="button"
                                         on:click={() =>
                                             dispatch('modifyFile', {
                                                 index,
@@ -97,6 +102,7 @@
                                         <button
                                             class="button is-small is-light"
                                             title="Compiled checkers are read only"
+                                            type="button"
                                             disabled
                                         >
                                             <span class="icon">
@@ -111,6 +117,7 @@
                                                 : 'lock'} this file for editing"
                                             class:is-primary={!file.readOnly}
                                             class:is-light={file.readOnly}
+                                            type="button"
                                             on:click={() =>
                                                 dispatch('modifyFile', {
                                                     index,
@@ -134,6 +141,7 @@
                                     <button
                                         class="button is-small is-danger"
                                         title="Delete this file"
+                                        type="button"
                                         on:click={() =>
                                             dispatch('delete', { index })}
                                     >
@@ -154,6 +162,7 @@
         <button
             class="button is-fullwidth"
             on:click={() => dispatch('newFile')}
+            type="button"
         >
             <span class="icon">
                 <Fa icon={faPlus} />
@@ -163,9 +172,9 @@
     </div>
 
     <div slot="footer">
-        <button class="button is-primary" on:click={() => dispatch('close')}
-            >Accept</button
-        >
+        <button class="button is-primary">
+            Accept
+        </button>
     </div>
 </Modal>
 
diff --git a/src/lib/Modal.svelte b/src/lib/Modal.svelte
index 371e62c..62b3bca 100644
--- a/src/lib/Modal.svelte
+++ b/src/lib/Modal.svelte
@@ -1,10 +1,23 @@
 <script>
-    import { createEventDispatcher } from 'svelte';
+    import { createEventDispatcher, tick } from 'svelte';
     import { fade, fly } from 'svelte/transition';
 
     export let title;
     export let active = false;
     const dispatch = createEventDispatcher();
+    let form;
+
+    $: setFocus(active);
+
+    async function setFocus(active) {
+        if (active) {
+            await tick();
+            if (form) {
+                form.focus();
+            }
+            dispatch('activate');
+        }
+    }
 
     function cancel() {
         dispatch('cancel');
@@ -12,14 +25,26 @@
 </script>
 
 {#if active}
-    <div transition:fade={{ duration: 200 }} class="modal is-active">
+    <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+    <form
+        tabindex="0"
+        bind:this={form}
+        transition:fade={{ duration: 200 }}
+        class="modal is-active"
+        on:submit
+    >
         <!-- svelte-ignore a11y-click-events-have-key-events -->
         <!-- svelte-ignore a11y-no-static-element-interactions-->
         <div class="modal-background" on:click={cancel} />
         <div transition:fly={{ y: -200, duration: 200 }} class="modal-card">
             <header class="modal-card-head">
                 <p class="modal-card-title">{title}</p>
-                <button class="delete" aria-label="close" on:click={cancel} />
+                <button
+                    type="button"
+                    class="delete"
+                    aria-label="close"
+                    on:click={cancel}
+                />
             </header>
             <section class="modal-card-body">
                 <slot />
@@ -30,5 +55,5 @@
                 </slot>
             </footer>
         </div>
-    </div>
+    </form>
 {/if}
diff --git a/src/lib/ModelModal.svelte b/src/lib/ModelModal.svelte
index fe02046..525867e 100644
--- a/src/lib/ModelModal.svelte
+++ b/src/lib/ModelModal.svelte
@@ -22,19 +22,38 @@
 <Modal
     {active}
     title="Select model to run"
+    on:submit={accept}
     on:cancel={() => dispatch('cancel')}
 >
-    <div class="select is-fullwidth">
-        <select bind:value={selectedModel}>
+    <div class="select is-fullwidth is-multiple">
+        <select
+            bind:value={selectedModel}
+            size={Math.min(8, modelFiles.length)}
+        >
             {#each modelFiles as modelFile}
                 <option value={modelFile}>{modelFile}</option>
             {/each}
         </select>
     </div>
     <div slot="footer">
-        <button class="button is-primary" on:click={accept}> OK </button>
-        <button class="button" on:click={() => dispatch('cancel')}>
+        <button class="button is-primary"> OK </button>
+        <button
+            type="button"
+            class="button"
+            on:click={() => dispatch('cancel')}
+        >
             Cancel
         </button>
     </div>
 </Modal>
+
+<style>
+    .select.is-multiple select {
+        height: auto;
+        padding: 0;
+    }
+
+    .select.is-multiple option {
+        padding: 0.5em 1em;
+    }
+</style>
diff --git a/src/lib/NewFileModal.svelte b/src/lib/NewFileModal.svelte
index f7f7ac3..3895b8a 100644
--- a/src/lib/NewFileModal.svelte
+++ b/src/lib/NewFileModal.svelte
@@ -1,12 +1,19 @@
 <script>
-    import { createEventDispatcher } from 'svelte';
+    import { createEventDispatcher, tick } from 'svelte';
     import Modal from './Modal.svelte';
     export let active = false;
 
     const dispatch = createEventDispatcher();
     let fileInput;
     let files;
+    let element;
 
+    async function setFocus() {
+        await tick();
+        if (element) {
+            element.focus();
+        }
+    }
     async function uploaded() {
         const promises = [];
         for (const file of files) {
@@ -26,64 +33,76 @@
     }
 </script>
 
-<Modal {active} title="Create new file" on:cancel={() => dispatch('cancel')}>
+<Modal
+    {active}
+    title="Create new file"
+    on:activate={setFocus}
+    on:cancel={() => dispatch('cancel')}
+>
     <aside class="menu">
         <p class="menu-label">Model</p>
         <ul class="menu-list">
             <li>
-                <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <!-- svelte-ignore a11y-missing-attribute -->
-                <!-- svelte-ignore a11y-no-static-element-interactions-->
-                <a on:click={() => dispatch('new', { type: '.mzn' })}
-                    >Model file (.mzn)</a
+                <button
+                    type="button"
+                    class="button is-text"
+                    bind:this={element}
+                    on:click={() => dispatch('new', { type: '.mzn' })}
                 >
+                    Model file (.mzn)
+                </button>
             </li>
             <li>
-                <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <!-- svelte-ignore a11y-missing-attribute -->
-                <!-- svelte-ignore a11y-no-static-element-interactions-->
-                <a on:click={() => dispatch('new', { type: '.mzc.mzn' })}
-                    >Solution checker model (.mzc.mzn)</a
+                <button
+                    type="button"
+                    class="button is-text"
+                    on:click={() => dispatch('new', { type: '.mzc.mzn' })}
                 >
+                    Solution checker model (.mzc.mzn)
+                </button>
             </li>
         </ul>
         <p class="menu-label">Data</p>
         <ul class="menu-list">
             <li>
-                <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <!-- svelte-ignore a11y-missing-attribute -->
-                <!-- svelte-ignore a11y-no-static-element-interactions-->
-                <a on:click={() => dispatch('new', { type: '.dzn' })}
-                    >Data file (.dzn)</a
+                <button
+                    type="button"
+                    class="button is-text"
+                    on:click={() => dispatch('new', { type: '.dzn' })}
                 >
+                    Data file (.dzn)
+                </button>
             </li>
             <li>
-                <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <!-- svelte-ignore a11y-missing-attribute -->
-                <!-- svelte-ignore a11y-no-static-element-interactions-->
-                <a on:click={() => dispatch('new', { type: '.json' })}
-                    >JSON data file (.json)</a
+                <button
+                    type="button"
+                    class="button is-text"
+                    on:click={() => dispatch('new', { type: '.json' })}
                 >
+                    JSON data file (.json)
+                </button>
             </li>
         </ul>
         <p class="menu-label">Visualisation</p>
         <ul class="menu-list">
             <li>
-                <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <!-- svelte-ignore a11y-missing-attribute -->
-                <!-- svelte-ignore a11y-no-static-element-interactions-->
-                <a on:click={() => dispatch('new', { type: '.html' })}
-                    >Custom visualisation (.html)</a
+                <button
+                    type="button"
+                    class="button is-text"
+                    on:click={() => dispatch('new', { type: '.html' })}
                 >
+                    Custom visualisation (.html)
+                </button>
             </li>
         </ul>
         <p class="menu-label">Import</p>
         <ul class="menu-list">
             <li>
-                <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <!-- svelte-ignore a11y-missing-attribute -->
-                <!-- svelte-ignore a11y-no-static-element-interactions-->
-                <a on:click={() => fileInput.click()}>Upload file(s)</a>
+                <button
+                    type="button"
+                    class="button is-text"
+                    on:click={() => fileInput.click()}>Upload file(s)</button
+                >
             </li>
         </ul>
     </aside>
@@ -103,4 +122,11 @@
     .is-hidden {
         display: none;
     }
+
+    .menu-list .button {
+        text-decoration: none;
+        display: block;
+        width: 100%;
+        text-align: left;
+    }
 </style>
diff --git a/src/lib/ParameterModal.svelte b/src/lib/ParameterModal.svelte
index 3a32099..8c35d24 100644
--- a/src/lib/ParameterModal.svelte
+++ b/src/lib/ParameterModal.svelte
@@ -1,5 +1,5 @@
 <script>
-    import { createEventDispatcher } from 'svelte';
+    import { createEventDispatcher, tick } from 'svelte';
     import Modal from './Modal.svelte';
     const dispatch = createEventDispatcher();
 
@@ -10,11 +10,19 @@
     let dataTab = true;
     let selectedFiles = [];
     let parameterValues = [];
+    let focusInput;
 
     $: createParameterValues(parameters);
     $: hasDataFiles = dataFiles.length > 0;
     $: dataTabActive = hasDataFiles && dataTab;
 
+    async function setFocus() {
+        await tick();
+        if (focusInput) {
+            focusInput.focus();
+        }
+    }
+
     function createParameterValues(parameters) {
         parameterValues = Object.keys(parameters)
             .sort()
@@ -39,7 +47,13 @@
     }
 </script>
 
-<Modal {active} title="Model parameters" on:cancel={() => dispatch('cancel')}>
+<Modal
+    {active}
+    title="Model parameters"
+    on:activate={setFocus}
+    on:submit={accept}
+    on:cancel={() => dispatch('cancel')}
+>
     {#if hasDataFiles}
         <div class="tabs">
             <ul>
@@ -60,24 +74,40 @@
     {/if}
     {#if dataTabActive}
         <div class="select is-fullwidth is-multiple">
-            <select multiple size="8" bind:value={selectedFiles}>
+            <select
+                bind:this={focusInput}
+                multiple
+                size={Math.min(8, dataFiles.length)}
+                bind:value={selectedFiles}
+            >
                 {#each dataFiles as dataFile}
                     <option value={dataFile}>{dataFile}</option>
                 {/each}
             </select>
         </div>
     {:else}
-        {#each parameterValues as param}
+        {#each parameterValues as param, i}
             <div class="param">
                 <span>{param.name} = </span>
-                <input class="input" bind:value={param.value} />
+                {#if i === 0}
+                    <input
+                        class="input"
+                        bind:this={focusInput}
+                        bind:value={param.value}
+                    />
+                {:else}
+                    <input class="input" bind:value={param.value} />
+                {/if}
             </div>
         {/each}
     {/if}
-
     <div slot="footer">
-        <button class="button is-primary" on:click={accept}> OK </button>
-        <button class="button" on:click={() => dispatch('cancel')}>
+        <button class="button is-primary">OK</button>
+        <button
+            type="button"
+            class="button"
+            on:click={() => dispatch('cancel')}
+        >
             Cancel
         </button>
     </div>
diff --git a/src/lib/Playground.svelte b/src/lib/Playground.svelte
index 1ccfdb7..0d82d58 100644
--- a/src/lib/Playground.svelte
+++ b/src/lib/Playground.svelte
@@ -1401,7 +1401,7 @@
             >
                 Delete
             </button>
-            <button class="button" on:click={() => (deleteFileRequested = null)}
+            <button type="button" class="button" on:click={() => (deleteFileRequested = null)}
                 >Cancel</button
             >
         </div>
@@ -1440,6 +1440,7 @@
             </p>
             <p class="control">
                 <button
+                    type="button"
                     class="button"
                     class:is-primary={!copiedShareUrl}
                     class:is-success={copiedShareUrl}
diff --git a/src/lib/SolverConfig.svelte b/src/lib/SolverConfig.svelte
index c70cfa7..198d64c 100644
--- a/src/lib/SolverConfig.svelte
+++ b/src/lib/SolverConfig.svelte
@@ -142,136 +142,139 @@
 
         <h5 class="title is-5">Solving options</h5>
 
-        <div class="field is-grouped">
-            <p class="control checkbox-control">
-                <input
-                    id="enable-timelimit"
-                    type="checkbox"
-                    bind:checked={enableTimeLimit}
-                />
-                <label for="enable-timelimit">Time limit (s)</label>
-            </p>
-            <p class="control is-expanded">
-                <input
-                    class="input is-fullwidth"
-                    type="number"
-                    step="1"
-                    min={0}
-                    disabled={!enableTimeLimit}
-                    bind:value={timeLimit}
-                />
-            </p>
-        </div>
-
-        {#if hasStdFlag(stdFlags, '-a')}
-            <div class="field">
+        <form on:submit={() => dispatch('close')}>
+            <div class="field is-grouped">
                 <p class="control checkbox-control">
                     <input
-                        id="enable-all-solutions"
+                        id="enable-timelimit"
                         type="checkbox"
-                        bind:checked={allSolutions}
+                        bind:checked={enableTimeLimit}
+                    />
+                    <label for="enable-timelimit">Time limit (s)</label>
+                </p>
+                <p class="control is-expanded">
+                    <input
+                        class="input is-fullwidth"
+                        type="number"
+                        step="1"
+                        min={0}
+                        disabled={!enableTimeLimit}
+                        bind:value={timeLimit}
                     />
-                    <label for="enable-all-solutions">
-                        All solutions (for satisfication problems)
-                    </label>
                 </p>
             </div>
-        {/if}
 
-        {#if hasStdFlag(stdFlags, '-f')}
+            {#if hasStdFlag(stdFlags, '-a')}
+                <div class="field">
+                    <p class="control checkbox-control">
+                        <input
+                            id="enable-all-solutions"
+                            type="checkbox"
+                            bind:checked={allSolutions}
+                        />
+                        <label for="enable-all-solutions">
+                            All solutions (for satisfication problems)
+                        </label>
+                    </p>
+                </div>
+            {/if}
+
+            {#if hasStdFlag(stdFlags, '-f')}
+                <div class="field">
+                    <p class="control checkbox-control">
+                        <input
+                            id="enable-free-search"
+                            type="checkbox"
+                            bind:checked={freeSearch}
+                        />
+                        <label for="enable-free-search">Free search</label>
+                    </p>
+                </div>
+            {/if}
+
+            <h5 class="title is-5">Output options</h5>
+
             <div class="field">
                 <p class="control checkbox-control">
                     <input
-                        id="enable-free-search"
+                        id="enable-verbose-compile"
                         type="checkbox"
-                        bind:checked={freeSearch}
+                        bind:checked={verboseCompilation}
                     />
-                    <label for="enable-free-search">Free search</label>
+                    <label for="enable-verbose-compile"
+                        >Verbose compilation</label
+                    >
                 </p>
             </div>
-        {/if}
-
-        <h5 class="title is-5">Output options</h5>
-
-        <div class="field">
-            <p class="control checkbox-control">
-                <input
-                    id="enable-verbose-compile"
-                    type="checkbox"
-                    bind:checked={verboseCompilation}
-                />
-                <label for="enable-verbose-compile">Verbose compilation</label>
-            </p>
-        </div>
-
-        {#if hasStdFlag(stdFlags, '-v')}
+
+            {#if hasStdFlag(stdFlags, '-v')}
+                <div class="field">
+                    <p class="control checkbox-control">
+                        <input
+                            id="enable-verbose-solve"
+                            type="checkbox"
+                            bind:checked={verboseSolving}
+                        />
+                        <label for="enable-verbose-solve">Verbose solving</label
+                        >
+                    </p>
+                </div>
+            {/if}
+
             <div class="field">
                 <p class="control checkbox-control">
                     <input
-                        id="enable-verbose-solve"
+                        id="enable-compilation-satistics"
                         type="checkbox"
-                        bind:checked={verboseSolving}
+                        bind:checked={compilerStatistics}
                     />
-                    <label for="enable-verbose-solve">Verbose solving</label>
+                    <label for="enable-compilation-satistics"
+                        >Compilation statistics</label
+                    >
                 </p>
             </div>
-        {/if}
-
-        <div class="field">
-            <p class="control checkbox-control">
-                <input
-                    id="enable-compilation-satistics"
-                    type="checkbox"
-                    bind:checked={compilerStatistics}
-                />
-                <label for="enable-compilation-satistics"
-                    >Compilation statistics</label
-                >
-            </p>
-        </div>
-
-        {#if hasStdFlag(stdFlags, '-s')}
+
+            {#if hasStdFlag(stdFlags, '-s')}
+                <div class="field">
+                    <p class="control checkbox-control">
+                        <input
+                            id="enable-solving-satistics"
+                            type="checkbox"
+                            bind:checked={solvingStatistics}
+                        />
+                        <label for="enable-solving-satistics"
+                            >Solving statistics</label
+                        >
+                    </p>
+                </div>
+            {/if}
+
             <div class="field">
                 <p class="control checkbox-control">
                     <input
-                        id="enable-solving-satistics"
+                        id="enable-timing-information"
                         type="checkbox"
-                        bind:checked={solvingStatistics}
+                        bind:checked={outputTime}
                     />
-                    <label for="enable-solving-satistics"
-                        >Solving statistics</label
+                    <label for="enable-timing-information"
+                        >Timing information</label
+                    >
+                </p>
+            </div>
+
+            <div class="field is-grouped bottom-buttons">
+                <p class="control">
+                    <button class="button is-primary"> Accept </button>
+                </p>
+                <p class="control">
+                    <button
+                        type="button"
+                        class="button is-danger"
+                        on:click={reset}>Reset to defaults</button
                     >
                 </p>
             </div>
-        {/if}
-
-        <div class="field">
-            <p class="control checkbox-control">
-                <input
-                    id="enable-timing-information"
-                    type="checkbox"
-                    bind:checked={outputTime}
-                />
-                <label for="enable-timing-information">Timing information</label
-                >
-            </p>
-        </div>
-
-        <div class="field is-grouped bottom-buttons">
-            <p class="control">
-                <button
-                    class="button is-primary"
-                    on:click={() => dispatch('close')}
-                >
-                    Accept
-                </button>
-            </p>
-            <p class="control">
-                <button class="button is-danger" on:click={reset}
-                    >Reset to defaults</button
-                >
-            </p>
-        </div>
+        </form>
     </div>
 {/if}