diff --git a/css/style.css b/css/style.css
index 14f9a4f..b1523db 100644
--- a/css/style.css
+++ b/css/style.css
@@ -420,6 +420,10 @@ code {
   margin: 4px 0;
 }
 
+#glyph-name-note {
+  display: none;
+}
+
 .upload-note {
   max-width: 320px;
 }
@@ -519,7 +523,7 @@ input[type="radio"] {
 }
 
 .glyph-input {
-  width: 80px;
+  width: 300px;
   margin-left: 10px;
 }
 
@@ -639,6 +643,9 @@ input[type="file"]::file-selector-button {
 
 #image-size-settings li {
   margin: 6px 0;
+  border: 1px solid var(--border-subtle);
+  border-radius: var(--radius-lg);
+  padding: 8px 12px;
 }
 
 /* ---- Preview canvases ---- */
diff --git a/index.html b/index.html
index 441cab4..0822a2b 100644
--- a/index.html
+++ b/index.html
@@ -95,6 +95,9 @@
               <div id="only-images-file-error" class="msg error-msg">Only images file type are allowed</div>
               <div class="no-file-selected msg">Select one or more images at <a href="#step-1">step 1</a> first.</div>
               <button id="all-same-size" onclick="allSameSize()">Apply first image size to all images</button>
+              <div class="note" id="glyph-name-note">
+                <i>Glyph name is used to identify the image in the code.</i>
+              </div>
             </div>
           </div>
 
@@ -203,7 +206,7 @@
       <div class="step-num">3</div>
       <h2>Preview</h2>
       <section class="sub-section">
-        <div class="no-file-selected" class="msg">No files selected</div>
+        <div class="no-file-selected msg">No files selected</div>
         <div id="images-canvas-container"></div>
       </section>
     </section>
@@ -221,7 +224,6 @@
                 <option value="vertical1bit">Vertical - 1 bit per pixel</option>
                 <option value="horizontal565">Horizontal - 2 bytes per pixel (565)</option>
                 <option value="horizontalAlpha">Horizontal - 1 bit per pixel alpha map</option>
-                <option value="horizontal888">Horizontal - 3 bytes per pixel (rgb888</option>
                 <option value="horizontal888">Horizontal - 3 bytes per pixel (rgb888)</option>
               </select>
 
@@ -271,13 +273,13 @@
                   <div class="table-row">
                     <div class="table-cell"><label>First ASCII character (dec):</label></div>
                     <div class="table-cell">
-                      <input id="first-ascii-char" class="text-input" type="text" name="first-ascii-char" onchange="" value="48"/>
+                      <input id="first-ascii-char" class="text-input" type="text" name="first-ascii-char" value="48"/>
                     </div>
                   </div>
                   <div class="table-row">
                     <div class="table-cell"><label>x advance:</label></div>
                     <div class="table-cell">
-                      <input id="x-advance" class="text-input" type="text" name="x-advance" onchange="" value="0"/>
+                      <input id="x-advance" class="text-input" type="text" name="x-advance" value="0"/>
                     </div>
                   </div>
                 </div>
@@ -285,7 +287,7 @@
                   <div class="table-row">
                     <div class="table-cell"><label>Identifier/Prefix:</label></div>
                     <div class="table-cell">
-                      <input id="identifier" class="text-input" type="text" name="identifier" onchange="" value="epd_bitmap"/>
+                      <input id="identifier" class="text-input" type="text" name="identifier" value="epd_bitmap"/>
                     </div>
                   </div>
                 </div>
diff --git a/js/script.js b/js/script.js
index 89e408a..de86ee4 100644
--- a/js/script.js
+++ b/js/script.js
@@ -559,8 +559,10 @@ function setTextInputSize(width, height) {
 // Show/hide the "no images" error and report whether images are available
 function checkImagesAvailable() {
   const error = document.getElementById('no-images-error');
+  const glyphNameNote = document.getElementById('glyph-name-note');
   const hasImages = images.length() > 0;
   error.style.display = hasImages ? 'none' : 'block';
+  glyphNameNote.style.display = hasImages ? 'block' : 'none';
   return hasImages;
 }
 
@@ -725,13 +727,14 @@ function handleImageSelection(evt) {
         };
 
         const gil = document.createElement('span');
-        gil.innerHTML = 'glyph';
+        gil.innerHTML = 'glyph name';
         gil.className = 'file-info';
 
         const gi = document.createElement('input');
         gi.type = 'text';
         gi.name = 'glyph';
         gi.className = 'glyph-input';
+        gi.value = file.name.split('.')[0];
         gi.onchange = () => {
           const image = images.get(img);
           image.glyph = gi.value;
@@ -759,6 +762,7 @@ function handleImageSelection(evt) {
             });
           }
           updateAllImages();
+          checkImagesAvailable();
         };
 
         const rb = document.createElement('button');
@@ -852,7 +856,7 @@ function generateOutputString() {
         const comment = glyphComment(image);
         bytesUsed += code.split('\n').length * 16; // 16 bytes per line.
 
-        const varname = getIdentifier() + (image.glyph ? image.glyph.replace(/[^a-zA-Z0-9]/g, '_') : '');
+        const varname = getIdentifier() + (image.glyph ? `_${image.glyph.replace(/[^a-zA-Z0-9]/g, '_')}` : '');
         varQuickArray.push(varname);
         code = `${comment}const ${getImageType()} ${varname} [] PROGMEM = {\n${code}};\n`;
         outputString += code;