diff --git a/base.css b/base.css
index ffbcc3e..74b33dc 100644
--- a/base.css
+++ b/base.css
@@ -17,7 +17,9 @@ main{
     text-align: center;
 }
 .content > p{
-    word-break: break-all;
+    word-break: break-word;
+    -ms-word-wrap: break-word;
+    word-wrap: break-word;
     margin-top: 0.5em;
     margin-bottom: 0.5em;
 }
diff --git a/goinfo.go.html b/goinfo.go.html
index efb6143..1065c32 100644
--- a/goinfo.go.html
+++ b/goinfo.go.html
@@ -18,7 +18,9 @@
             text-align: left;
             border: black 1px solid;
             border-collapse: collapse;
-            word-break: break-all;
+            word-break: break-word;
+            -ms-word-wrap: break-word;
+            word-wrap: break-word;
         }
         table, td {
             background-color: lightgray;
diff --git a/index.go.html b/index.go.html
index 64d8d01..021dce6 100644
--- a/index.go.html
+++ b/index.go.html
@@ -16,14 +16,14 @@
 <body>
 <header class="header">
     {{ if .Light }}
-    <a href="?light" class="home-button no-dec"><div><b>&#8962;</b></div></a>
-    <a href="?{{ .Parameters }}" class="home-button no-dec"><div><b>&#9790;</b></div></a>
+    <a href="?light" class="home-button no-dec"><div><img src="{{ .Data.LogoImageLocation }}" width="64px" alt="&#8962;"></div></a>
+    <a href="?{{ .Parameters }}" class="home-button no-dec"><div><img src="{{ .Data.MoonImageLocation }}" width="64px" alt='{{ "{" }}'></div></a>
     {{ else }}
-    <a href="?" class="home-button no-dec"><div><b>&#8962;</b></div></a>
+    <a href="?" class="home-button no-dec"><div><img src="{{ .Data.LogoImageLocation }}" width="64px" alt="&#8962;"></div></a>
     {{ if eq .Parameters "" }}
-    <a href="?light" class="home-button no-dec"><div><b>&#9737;</b></div></a>
+    <a href="?light" class="home-button no-dec"><div><img src="{{ .Data.SunImageLocation }}" width="64px" alt='()'></div></a>
     {{ else }}
-    <a href="?light&{{ .Parameters }}" class="home-button no-dec"><div><b>&#9737;</b></div></a>
+    <a href="?light&{{ .Parameters }}" class="home-button no-dec"><div><img src="{{ .Data.SunImageLocation }}" width="64px" alt='()'></div></a>
     {{ end }}
     {{ end }}
     <input class="sort-menu" type="checkbox" id="sort-menu"/>
@@ -81,9 +81,9 @@
                 <div class="item-table-360">
                     <div>
                     {{ if eq .VideoLocation "" }}
-                        <img src="{{ $.Data.NoVideoImageLocation }}" alt="No Video" width="360">
+                        <img src="{{ $.Data.NoVideoImageLocation }}" alt="No Video" width="360px">
                     {{ else }}
-                        <video controls width="360">
+                        <video controls width="360px">
                             <source src="{{ .VideoLocation }}" type="{{ .VideoContentType }}">
                             <a href="{{ .VideoLocation }}">The Video</a>
                         </video>
@@ -95,7 +95,7 @@
             <div class="item-table-caption">
                 <div class="image-box">
                     {{ range .GetImages }}
-                    <a href="{{ .ImageLocation }}"><img src="{{ .ThumbnailLocation }}" alt="{{ .ImageAltText }}" width="240"></a>
+                    <a href="{{ .ImageLocation }}"><img src="{{ .ThumbnailLocation }}" alt="{{ .ImageAltText }}" width="240px"></a>
                     {{ end }}
                 </div>
             </div>
diff --git a/pageHandler/pages/index/data.go b/pageHandler/pages/index/data.go
index f697ff2..649234c 100644
--- a/pageHandler/pages/index/data.go
+++ b/pageHandler/pages/index/data.go
@@ -9,6 +9,9 @@ type DataYaml struct {
 	CSSDarkURL           template.URL            `yaml:"cssDarkURL"`
 	JScriptURL           template.URL            `yaml:"jScriptURL"`
 	NoVideoImageLocation template.URL            `yaml:"noVideoImageLocation"`
+	LogoImageLocation    template.URL            `yaml:"logoImageLocation"`
+	SunImageLocation     template.URL            `yaml:"sunImageLocation"`
+	MoonImageLocation    template.URL            `yaml:"moonImageLocation"`
 	About                AboutYaml               `yaml:"about"`
 	Entries              []EntryYaml             `yaml:"entries"`
 }
