diff --git a/README.md b/README.md
index e9f30e2cf..b72956e86 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "PCjs: The Original IBM PC in Your Browser"
+title: PCjs
 permalink: /
 ---
 
diff --git a/_config.yml b/_config.yml
index f228406f9..573b734f6 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,5 +1,5 @@
 # Site settings
-title: PCjs
+title: "PCjs: The Original IBM PC in a Browser"
 email: Jeff@pcjs.org
 description: > # this means to ignore newlines until "baseurl:"
   Write an awesome description for your new site here. You can edit this
@@ -12,3 +12,9 @@ github_username:  jeffpar
 
 # Build settings
 markdown: kramdown
+
+kramdown:
+  input: GFM
+  hard_wrap: false
+
+pcjs_version: 1.20.1
diff --git a/_includes/head.html b/_includes/head.html
index 4d7e8f001..bddf96e52 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -2,10 +2,23 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width initial-scale=1" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
     <meta name="description" content="{{ site.description }}">
-
     <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+    <link rel="apple-touch-icon" sizes="57x57" href="{{ site.baseurl }}/versions/icons/current/pc-icon-57.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="{{ site.baseurl }}/versions/icons/current/pc-icon-72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="{{ site.baseurl }}/versions/icons/current/pc-icon-76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="{{ site.baseurl }}/versions/icons/current/pc-icon-114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="{{ site.baseurl }}/versions/icons/current/pc-icon-120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="{{ site.baseurl }}/versions/icons/current/pc-icon-144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="{{ site.baseurl }}/versions/icons/current/pc-icon-152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ site.baseurl }}/versions/icons/current/pc-icon-180.png">
+    <link rel="apple-touch-icon" sizes="192x192" href="{{ site.baseurl }}/versions/icons/current/pc-icon-192.png">
+    <link rel="apple-touch-icon" href="{{ site.baseurl }}/versions/icons/current/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="{{ site.baseurl }}/versions/icons/current/pc-icon-192.png">
+    <link rel="shortcut icon" type="image/x-icon" href="{{ site.baseurl }}/versions/icons/current/favicon.ico">
+    {% if page.machines %}
+	<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/versions/pcjs/{{ site.pcjs_version }}/components.css">
+    {% endif %}
 </head>
diff --git a/_includes/header.html b/_includes/header.html
index cfe381f75..2c7a880f5 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -14,8 +14,9 @@
       </a>
 
       <div class="trigger">
-        {% for page in site.pages %}
-          {% if page.title %}
+        {% assign sorted_pages = site.pages | sort:"menu_order" %}
+        {% for page in sorted_pages %}
+          {% if page.title and page.menu_order %}
           <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
           {% endif %}
         {% endfor %}
diff --git a/_includes/machine-engines.html b/_includes/machine-engines.html
new file mode 100644
index 000000000..c63e80849
--- /dev/null
+++ b/_includes/machine-engines.html
@@ -0,0 +1,4 @@
+{% for machine in page.machines %}
+  <script type="text/javascript" src="/versions/{{ machine.type }}js/{{ site.pcjs_version }}/{{ machine.type }}.js"></script>
+  <script type="text/javascript">window.embed{{ machine.type | upcase }}("{{ machine.id }}","machine.xml","/versions/{{ machine.type }}js/{{ site.pcjs_version }}/components.xsl");</script>
+{% endfor %}
diff --git a/_includes/machine.html b/_includes/machine.html
new file mode 100644
index 000000000..f3ee7c59f
--- /dev/null
+++ b/_includes/machine.html
@@ -0,0 +1 @@
+<div id="{{ include.id }}"></div>
diff --git a/_layouts/default.html b/_layouts/default.html
index e4ab96fb0..d2faafe42 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -14,6 +14,8 @@
     </div>
 
     {% include footer.html %}
+  
+    {% include machine-engines.html %}
 
   </body>
 
diff --git a/_layouts/page.html b/_layouts/page.html
index 74c1a1184..f8de36d10 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -3,9 +3,11 @@ layout: default
 ---
 <div class="post">
 
+  {% if page.display_title %}
   <header class="post-header">
     <h1 class="post-title">{{ page.title }}</h1>
   </header>
+  {% endif %}
 
   <article class="post-content">
     {{ content }}
diff --git a/_sass/_base.scss b/_sass/_base.scss
index 518bf2b0e..07ca82889 100644
--- a/_sass/_base.scss
+++ b/_sass/_base.scss
@@ -154,8 +154,8 @@ pre {
  * Wrapper
  */
 .wrapper {
-    max-width: -webkit-calc(800px - (#{$spacing-unit} * 2));
-    max-width:         calc(800px - (#{$spacing-unit} * 2));
+    /* max-width: -webkit-calc(800px - (#{$spacing-unit} * 2)); */
+    /* max-width:         calc(800px - (#{$spacing-unit} * 2)); */
     margin-right: auto;
     margin-left: auto;
     padding-right: $spacing-unit;
@@ -163,8 +163,8 @@ pre {
     @extend %clearfix;
 
     @include media-query($on-laptop) {
-        max-width: -webkit-calc(800px - (#{$spacing-unit}));
-        max-width:         calc(800px - (#{$spacing-unit}));
+        /* max-width: -webkit-calc(800px - (#{$spacing-unit})); */
+        /* max-width:         calc(800px - (#{$spacing-unit})); */
         padding-right: $spacing-unit / 2;
         padding-left: $spacing-unit / 2;
     }
diff --git a/about.md b/about.md
deleted file mode 100644
index 3ed64bb62..000000000
--- a/about.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: page
-title: About
-permalink: /about/
----
-
-This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
-
-You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new)
-
-You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)
diff --git a/devices/pc/machine/5150/mda/64kb/machine.md b/devices/pc/machine/5150/mda/64kb/machine.md
new file mode 100644
index 000000000..1b9f49058
--- /dev/null
+++ b/devices/pc/machine/5150/mda/64kb/machine.md
@@ -0,0 +1,10 @@
+---
+layout: page
+title: "PCjs | IBM PC (Model 5150) with Monochrome Display"
+permalink: /devices/pc/machine/5150/mda/64kb/
+machines:
+  - type: pc
+    id: ibm5150
+---
+
+{% include machine.html id="ibm5150" %}
diff --git a/docs/about/README.md b/docs/about/README.md
index ab7c957de..b919a572e 100644
--- a/docs/about/README.md
+++ b/docs/about/README.md
@@ -1,9 +1,12 @@
 ---
 layout: page
-title: About JavaScript Machines
+title: About
+menu_order: 10
 permalink: /docs/about/
 ---
 
+## About JavaScript Machines
+
 The JavaScript Machines Project (originally at [jsmachines.net](http://jsmachines.net/)) is a collection of computer
 simulations written in JavaScript.  It has now been released on [GitHub](https://github.com/) as the
 [PCjs Project](https://github.com/jeffpar/pcjs), a copy of which is hosted here at [pcjs.org](http://www.pcjs.org/).