diff --git a/main.html b/main.html
index 704753ca77..ad1d7bd2de 100644
--- a/main.html
+++ b/main.html
@@ -69,20 +69,22 @@
-
-
-
+
Suffixes : %kMGTcmunp Operations : ^ * / + - () Functions : sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs Constants : e
${"wiki_title"}
-
<%block name="headextra">
diff --git a/simplewiki_create.html b/simplewiki_create.html
index 3d820310f6..65ecbff4aa 100644
--- a/simplewiki_create.html
+++ b/simplewiki_create.html
@@ -2,6 +2,8 @@
<%inherit file="simplewiki_base.html"/>
+<%block name="title">Create Article - MITX 6.002 Wiki
+
<%block name="wiki_page_title">
Create article
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index 7ead7f4abc..30e2c6ecc0 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -2,6 +2,8 @@
<%inherit file="simplewiki_base.html"/>
+<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki
+
<%block name="wiki_page_title">
${ wiki_article.title }
diff --git a/simplewiki_error.html b/simplewiki_error.html
index 5f9bb0be5c..f4269f1043 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -6,6 +6,9 @@
from django.core.urlresolvers import reverse
%>
+<%block name="title">Oops... - MITX 6.002 Wiki
+
+
<%block name="wiki_page_title">
Oops...
diff --git a/simplewiki_history.html b/simplewiki_history.html
index 0cdeaf4b30..bea5a02284 100644
--- a/simplewiki_history.html
+++ b/simplewiki_history.html
@@ -2,6 +2,8 @@
<%inherit file="simplewiki_base.html"/>
+<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki
+
<%!
from django.core.urlresolvers import reverse
%>
diff --git a/simplewiki_instructions.html b/simplewiki_instructions.html
index d28919d5fb..8b579feda2 100644
--- a/simplewiki_instructions.html
+++ b/simplewiki_instructions.html
@@ -5,7 +5,7 @@
circuit:basic
$ LaTeX Math Expression$
To create a new wiki article, create a link to it. Clicking the link gives you the creation page.
- [Article](/wiki/view/Article/)
+ [Article Name](wiki:ArticleName)
Other useful examples:[Link](http://google.com)
Huge Header
diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html
index 88b70c3b7e..267a1f921b 100644
--- a/simplewiki_searchresults.html
+++ b/simplewiki_searchresults.html
@@ -2,6 +2,8 @@
<%inherit file="simplewiki_base.html"/>
+<%block name="title">
Search Results - MITX 6.002 Wiki
+
<%!
from django.core.urlresolvers import reverse
%>
diff --git a/simplewiki_view.html b/simplewiki_view.html
index 6492174670..05243b0bc1 100644
--- a/simplewiki_view.html
+++ b/simplewiki_view.html
@@ -2,6 +2,8 @@
<%inherit file="simplewiki_base.html"/>
+<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki
+
<%block name="wiki_page_title">
${ wiki_article.title } ${'- Deleted Revision! ' if wiki_current_revision_deleted else ''}
diff --git a/video.html b/video.html
index f6106fd671..fdfc9c27a3 100644
--- a/video.html
+++ b/video.html
@@ -1,4 +1,4 @@
-% if name != None:
+% if name is not UNDEFINED and name != None:
${name}
% endif
@@ -15,8 +15,7 @@
0:00/0:00
diff --git a/video_init.js b/video_init.js
index bf1b4bf5b7..42dddad573 100644
--- a/video_init.js
+++ b/video_init.js
@@ -34,7 +34,7 @@ loadNewVideo(streams["1.0"], ${ position });
function add_speed(key, stream) {
var id = 'speed_' + stream;
- $("#video_speeds").append(' '+key+'X ');
+ $("#video_speeds").append(' '+key+'x ');
$("#"+id).click(function(){
change_video_speed(key, stream);
});
@@ -57,3 +57,16 @@ l.sort(sort_by_value);
for(var i=0; i