diff --git a/apps/api/views/homework.py b/apps/api/views/homework.py
index 0d7bf12a..26e55f58 100644
--- a/apps/api/views/homework.py
+++ b/apps/api/views/homework.py
@@ -96,7 +96,7 @@ class DefinitionViewSet(ModelViewSet):
     queryset = Definition.objects.all()
     queryset = Definition.objects.all().prefetch_related(Prefetch(
         'custom_questions',
-        queryset=Question.objects.order_by('id')))
+        queryset=Question.objects.all()))
     serializer_class = DefinitionSerializer
     permission_classes = (DefinitionPermissionCheck,)
 
diff --git a/apps/homework/migrations/0057_auto_20200507_2015.py b/apps/homework/migrations/0057_auto_20200507_2015.py
new file mode 100644
index 00000000..d45f23e6
--- /dev/null
+++ b/apps/homework/migrations/0057_auto_20200507_2015.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.2.10 on 2020-05-07 20:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('homework', '0056_auto_20200507_1944'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='question',
+            options={'ordering': ('question',)},
+        ),
+        migrations.AlterField(
+            model_name='definition',
+            name='description',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]
diff --git a/apps/homework/models.py b/apps/homework/models.py
index 3b1a79ec..63d1f328 100644
--- a/apps/homework/models.py
+++ b/apps/homework/models.py
@@ -1,4 +1,5 @@
 import os
+import re
 from decimal import Decimal
 from urllib.parse import urlparse
 
@@ -27,7 +28,7 @@ class Definition(models.Model):
     due_date = models.DateTimeField(default=None)
 
     name = models.CharField(default=None, max_length=100, null=False, blank=False)
-    description = models.CharField(max_length=300, null=True, blank=True)
+    description = models.TextField(null=True, blank=True)
     updated_at = models.DateTimeField(auto_now=True)
 
     questions_only = models.BooleanField(default=False, null=False)
@@ -64,6 +65,10 @@ class Meta:
     def __str__(self):
         return "{}".format(self.name)
 
+    @property
+    def has_standard_questions(self):
+        return bool(self.ask_project_url) or bool(self.ask_publication_url) or bool(self.ask_method_name) or bool(self.ask_method_description)
+
     def get_challenge_url(self):
         parsed_uri = urlparse(self.challenge_url)
         scheme = parsed_uri.scheme
@@ -139,6 +144,20 @@ class Submission(models.Model):
     def __str__(self):
         return "{}".format(self.github_url)
 
+    @property
+    def nb_viewer_format_submission_url(self):
+        # This property is for prepending the nbviewer domain to the Github URL for Jupyter Notebook submissions.
+        url = self.github_url
+        if self.definition.jupyter_notebook_enabled:
+            if type(url) == str:
+                if not re.match('.*ipynb$', url):
+                    return url
+                if not re.match('.*github\.com.*', url):
+                    return url
+                url = url.split('github.com')[-1]
+                return f'https://nbviewer.jupyter.org/github{url}'
+        return url
+
     @property
     def get_challenge_url(self):
         if not self.definition.challenge_url:
@@ -257,7 +276,7 @@ def get_total_score(self):
 
     def calculate_grade(self):
         total, total_possible = self.get_total_score_total_possible()
-        self.text_grade = f"{total}/{total_possible}"
+        self.text_grade = f"{total}/{int(total_possible)}"
         if total_possible != 0 and total is not None:
             self.overall_grade = total / total_possible
             self.save()
@@ -323,6 +342,9 @@ class Question(models.Model):
     question = models.TextField()
     candidate_answers = JSONField(blank=True, default=list)
 
+    class Meta:
+        ordering = ('question',)
+
     def __str__(self):
         return self.question
 
diff --git a/apps/homework/templates/homework/forms/grade_homework.html b/apps/homework/templates/homework/forms/grade_homework.html
index 2a805bff..26f79120 100644
--- a/apps/homework/templates/homework/forms/grade_homework.html
+++ b/apps/homework/templates/homework/forms/grade_homework.html
@@ -32,36 +32,41 @@ <h4 class="ui header">Challenge Rules</h4>
                     <div class="ui relaxed celled list">
                         <a href="{{ definition.challenge_url }}" class="item" target="_blank" rel="noopener noreferrer">Link to challenge competition</a>
                         {% if submission.github_url %}
-                            <a href="{{ submission.github_url }}" class="item" target="_blank" rel="noopener noreferrer">Link to Github repo of submission</a>
+                            <a
+                               href="{{ submission.nb_viewer_format_submission_url }}"
+                               class="item"
+                               target="_blank"
+                               rel="noopener noreferrer"
+                            >Link to Github repo of submission</a>
                         {% endif %}
                         <a class="ui mini blue button" href="{% url "homework:submission_detail" submission_pk=submission.pk %}">Submission Details</a>
                     </div>
-                {% endif %}
 
-                {% if definition.jupyter_notebook_enabled %}
-                    <h4 class="ui header">Jupyter Notebook</h4>
-                    <div class="ui relaxed celled list">
-                        <div>Auto-Grade Score: {{ submission.jupyter_score }} / {{ definition.jupyter_notebook_highest }}</div>
-                        {% if submission_jupyter_warnings %}
-                            <div>Auto-Grade Warnings:</div>
-                            <ul>
-                            {% for warning in submission_jupyter_warnings %}
-                                <li>{{ warning }}</li>
-                            {% endfor %}
-                            </ul>
-                        {% endif %}
+                    {% if definition.jupyter_notebook_enabled %}
+                        <h4 class="ui header">Jupyter Notebook</h4>
+                        <div class="ui relaxed celled list">
+                            <div>Auto-Grade Score: {{ submission.jupyter_score }} / {{ definition.jupyter_notebook_highest }}</div>
+                            {% if submission_jupyter_warnings %}
+                                <div>Auto-Grade Warnings:</div>
+                                <ul>
+                                {% for warning in submission_jupyter_warnings %}
+                                    <li>{{ warning }}</li>
+                                {% endfor %}
+                                </ul>
+                            {% endif %}
 
-                        {% if submission_jupyter_errors %}
-                            <div>Auto-Grade Errors:</div>
-                            <ul>
-                            {% for error in submission_jupyter_errors %}
-                                <li>{{ error }}</li>
-                            {% endfor %}
-                            </ul>
-                        {% endif %}
-                    </div>
-                {% endif %}
+                            {% if submission_jupyter_errors %}
+                                <div>Auto-Grade Errors:</div>
+                                <ul>
+                                {% for error in submission_jupyter_errors %}
+                                    <li>{{ error }}</li>
+                                {% endfor %}
+                                </ul>
+                            {% endif %}
+                        </div>
+                    {% endif %}
 
+                {% endif %}
 
                 <h4>Questions</h4>
                 <div class="ui relaxed celled list">
@@ -81,6 +86,9 @@ <h4>Questions</h4>
                                    target="_blank" rel="noopener noreferrer"
                                 >{{ submission.publication_url }}</a></li>{% endif %}
                     </ol>
+                    {% if not definition.has_standard_questions %}
+                        <p>No standard questions defined for this homework.</p>
+                    {% endif %}
                 </div>
                 <grade-homework></grade-homework>
             </div>
diff --git a/apps/homework/templates/homework/overview.html b/apps/homework/templates/homework/overview.html
index 3bd41749..144cf713 100644
--- a/apps/homework/templates/homework/overview.html
+++ b/apps/homework/templates/homework/overview.html
@@ -2,6 +2,7 @@
 {% extends 'base.html' %}
 {% load static %}
 {% load homework_tags %}
+{% load chagrade_tags %}
 
 {% block title %}Welcome{% endblock %}
 
@@ -90,7 +91,7 @@ <h4 class="ui header">Submission Details:</h4>
                                                         {% if not definition.questions_only %}
                                                             {% if submission.github_url %}
                                                                 <div class="item"><a
-                                                                    href="{{ submission.github_url }}"
+                                                                    href="{{ submission.nb_viewer_format_submission_url }}"
                                                                     target="_blank" rel="noopener noreferrer"
                                                                     class="">Github URL for Submission</a></div>
                                                             {% else %}
@@ -236,7 +237,9 @@ <h4 class="ui header">Submission Details:</h4>
                                                 <div class="five wide column">
                                                     <div class="ui statistic">
                                                         <div class="value">
-                                                            {{ grade.text_grade }}
+                                                            {% with grade.calculate_grade as g %}
+                                                                {{ grade.text_grade }}
+                                                            {% endwith %}
                                                         </div>
                                                         <div class="label">
                                                             Total Grade
@@ -245,7 +248,7 @@ <h4 class="ui header">Submission Details:</h4>
                                                     {% if definition.jupyter_notebook_enabled %}
                                                         <div class="ui tiny statistic">
                                                             <div class="value">
-                                                                {{ grade.jupyter_notebook_grade }}/{{ definition.jupyter_notebook_highest }}
+                                                                {{ grade.jupyter_notebook_grade|default:0.0 }}/{{ definition.jupyter_notebook_highest|format_as_int }}
                                                             </div>
                                                             <div class="label">
                                                                 JUPYTER NOTEBOOK GRADE
diff --git a/apps/homework/templates/homework/submission_detail.html b/apps/homework/templates/homework/submission_detail.html
index 5f465bae..f0cf4a47 100644
--- a/apps/homework/templates/homework/submission_detail.html
+++ b/apps/homework/templates/homework/submission_detail.html
@@ -69,7 +69,13 @@
                                             <div class="ui header">Submission Information</div>
                                             <div class="ui divider"></div>
 
-                                            <submission-detail-github class="ui grid" submission_pk="{{ submission.pk }}" hash="{{ submission.commit_hash }}" user_pk="{{ request.user.pk }}"></submission-detail-github>
+                                            <submission-detail-github
+                                                class="ui grid"
+                                                submission_pk="{{ submission.pk }}"
+                                                submission_url="{{ submission.nb_viewer_format_submission_url }}"
+                                                hash="{{ submission.commit_hash }}"
+                                                user_pk="{{ request.user.pk }}"
+                                            ></submission-detail-github>
                                         </div>
                                     </div>
 
diff --git a/apps/homework/templates/homework/submission_list.html b/apps/homework/templates/homework/submission_list.html
index 0ac72990..d5efc2ea 100644
--- a/apps/homework/templates/homework/submission_list.html
+++ b/apps/homework/templates/homework/submission_list.html
@@ -87,7 +87,9 @@ <h4>Due Date: {{ definition.due_date }}</h4>
                                                             {% endif %}
                                                             <td>
                                                                 {% if submission.github_url %}
-                                                                    <a class="ui mini blue icon button" href="{{ submission.github_url }}" target="_blank" rel="noopener noreferrer">
+                                                                    <a class="ui mini blue icon button"
+                                                                       href="{{ submission.nb_viewer_format_submission_url }}"
+                                                                       target="_blank" rel="noopener noreferrer">
                                                                         <i class="file code icon"></i>
                                                                     </a>
                                                                 {% else %}
diff --git a/apps/klasses/migrations/0016_auto_20200507_2015.py b/apps/klasses/migrations/0016_auto_20200507_2015.py
new file mode 100644
index 00000000..84d3734b
--- /dev/null
+++ b/apps/klasses/migrations/0016_auto_20200507_2015.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.10 on 2020-05-07 20:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('klasses', '0015_auto_20200326_2135'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='klass',
+            name='description',
+            field=models.TextField(blank=True, default='', null=True),
+        ),
+    ]
diff --git a/apps/klasses/models.py b/apps/klasses/models.py
index a88afb2a..de0f34da 100644
--- a/apps/klasses/models.py
+++ b/apps/klasses/models.py
@@ -35,7 +35,7 @@ class Klass(models.Model):
 
     title = models.CharField(max_length=60, null=False, blank=False, default="New Course")
     course_number = models.SlugField(max_length=60, null=False, blank=False)
-    description = models.CharField(max_length=300, null=True, blank=True, default="")
+    description = models.TextField(null=True, blank=True, default="")
 
     created = models.DateTimeField(editable=False, default=timezone.now, null=True, blank=True)
     modified = models.DateTimeField(default=timezone.now, null=True, blank=True)
diff --git a/apps/klasses/templates/klasses/wizard/grade_homework.html b/apps/klasses/templates/klasses/wizard/grade_homework.html
index 318e3745..ace1c9a4 100644
--- a/apps/klasses/templates/klasses/wizard/grade_homework.html
+++ b/apps/klasses/templates/klasses/wizard/grade_homework.html
@@ -9,9 +9,17 @@ <h2 class="ui massive header" style="font-size: 56px;">Grade Homework</h2>
     <div class="ui fourteen wide column message">
         <div style="overflow-x: scroll;">
             <h1>Students</h1>
-            <span>
-                <a href="{% url 'homework:get_grades_csv' klass_pk=klass.pk %}" class="ui blue button">Download CSV</a>
-            </span>
+            <div class="table-header-container">
+                <span>
+                    <a href="{% url 'homework:get_grades_csv' klass_pk=klass.pk %}" class="ui blue button">Download CSV</a>
+                </span>
+                <div class="ui horizonatal relaxed list">
+                    <div class="ui gray label">Not Graded</div>
+                    <div class="ui yellow label">Grade Not Published</div>
+                    <div class="ui green label">Grade Published</div>
+                    <div class="ui orange label">Jupyter Notebook Needs Review</div>
+                </div>
+            </div>
             <table style="display: block; overflow-x: scroll; max-height: 100vh;" class="ui sortable table" onscroll="second_row_height_adjustment()">
                 <thead>
                 <tr id="first-row">
@@ -87,16 +95,15 @@ <h1>Students</h1>
                 {% endfor %}
                 </tbody>
             </table>
-            <div class="ui horizonatal relaxed list">
-                <div class="ui gray label">Not Graded</div>
-                <div class="ui yellow label">Grade Not Published</div>
-                <div class="ui green label">Grade Published</div>
-                <div class="ui orange label">Jupyter Notebook Needs Review</div>
-            </div>
         </div>
     </div>
 
     <style>
+        .table-header-container {
+            display: flex;
+            justify-content: space-between;
+        }
+
         .left-sticky {
             position: sticky;
             left: 0;
diff --git a/apps/klasses/templatetags/chagrade_tags.py b/apps/klasses/templatetags/chagrade_tags.py
index 60e37037..40b820a6 100644
--- a/apps/klasses/templatetags/chagrade_tags.py
+++ b/apps/klasses/templatetags/chagrade_tags.py
@@ -17,6 +17,13 @@ def format_url_with_schema(url):
     return url
 
 
+def format_as_int(number):
+    if number is not None:
+        return int(number)
+    else:
+        return number
+
+
 def get_submission(definition_pk, student_pk):
     """Gets a submission given a definition and a student"""
     try:
@@ -41,6 +48,7 @@ def format_json_array(json_array):
     return outstring
 
 
+register.filter('format_as_int', format_as_int)
 register.filter('format_url_with_schema', format_url_with_schema)
 register.filter('get_submission', get_submission)
 register.filter('format_json_array', format_json_array)
diff --git a/static/riotjs/student/submission_detail_github.tag b/static/riotjs/student/submission_detail_github.tag
index 7293055e..72131d05 100644
--- a/static/riotjs/student/submission_detail_github.tag
+++ b/static/riotjs/student/submission_detail_github.tag
@@ -1,7 +1,7 @@
 <submission-detail-github>
     <div class="{definition.questions_only ? 'sixteen' : 'six'} wide column">
 
-        <a if="{ submission.github_url }" class="ui tiny black button" href="{ submission.github_url }">Submission File</a>
+        <a if="{ submission.github_url }" class="ui tiny black button" href="{ opts.submission_url }" target="_blank">Submission File</a>
         <p>Submitted: { format_date(submission.created) }</p>
         <p if="{ !!submission.commit_hash && submission.commit_hash !== 'Commit (Optional)' }">Commit hash: { submission.commit_hash.slice(0,6) }</p>
         <p if="{ submission.github_repo_name }">Repository Name: { submission.github_repo_name }</p>
diff --git a/static/riotjs/wizard/define_homework.tag b/static/riotjs/wizard/define_homework.tag
index d61b2624..16673263 100644
--- a/static/riotjs/wizard/define_homework.tag
+++ b/static/riotjs/wizard/define_homework.tag
@@ -3,7 +3,18 @@
     <form class="ui form" ref="form" onsubmit="{  }">
         <!-- Important information -->
         <div class="fields">
-            <div class="three wide field">
+
+            <div class="six wide required field">
+                <label>Name:</label>
+                <input type="text"
+                       name="name"
+                       maxlength="100"
+                       required
+                       ref="name"
+                       value="{definition.name}">
+            </div>
+
+            <div class="twelve wide field">
                 <div class="ui required calendar field">
                     <label>
                         Due-Date:
@@ -18,24 +29,16 @@
                     </div>
                 </div>
             </div>
-
-            <div class="three wide required field">
-                <label>Name:</label>
-                <input type="text"
-                       name="name"
-                       maxlength="100"
-                       required
-                       ref="name"
-                       value="{definition.name}">
-            </div>
-
-            <div class="ten wide field">
+        </div>
+        <div class="fields">
+            <div class="sixteen wide field">
                 <label>Description:</label>
-                <input type="text"
+                <textarea type="text"
                        name="description"
                        maxlength="300"
                        ref="description"
                        value="{definition.description}">
+                </textarea>
             </div>
         </div>
 
diff --git a/static/riotjs/wizard/grade_homework.tag b/static/riotjs/wizard/grade_homework.tag
index d3259a53..8144d047 100644
--- a/static/riotjs/wizard/grade_homework.tag
+++ b/static/riotjs/wizard/grade_homework.tag
@@ -1,5 +1,5 @@
 <grade-homework>
-    <h4>Other Homework Questions</h4>
+    <h4>Custom Homework Questions</h4>
     <div class="ui relaxed celled list">
         <ol>
             <li each="{ question in definition.custom_questions }">{ question.question }
@@ -11,11 +11,17 @@
                 </ul>
             </li>
         </ol>
+        <p if="{ definition.custom_questions.length == 0}">No custom questions defined for this homework.</p>
     </div>
 
-    <h4 class="ui header">Grades:</h4>
-    <label>Jupyter Notebook ({definition.jupyter_notebook_lowest} - {definition.jupyter_notebook_highest}):</label>
-    <input placeholder="{definition.jupyter_notebook_lowest} - {definition.jupyter_notebook_highest}" name="jupyter_notebook_grade" ref="jupyter_notebook_grade" type="text" value="{grade.jupyter_notebook_grade}">
+    <h4 class="ui header">Criteria:</h4>
+    <label if="{ definition.jupyter_notebook_enabled }">Jupyter Notebook ({definition.jupyter_notebook_lowest} - {definition.jupyter_notebook_highest}):</label>
+    <input if="{ definition.jupyter_notebook_enabled }"
+           placeholder="{definition.jupyter_notebook_lowest} - {definition.jupyter_notebook_highest}"
+           name="jupyter_notebook_grade"
+           ref="jupyter_notebook_grade"
+           type="text"
+           value="{grade.jupyter_notebook_grade}">
     <div class="ui relaxed celled list">
         <ol>
             <li each="{criteria, index in definition.criterias}" class="inline field">
@@ -25,6 +31,7 @@
                 <input placeholder="{criteria.lower_range} - {criteria.upper_range}" name="{'criteria_answer_' + index}" ref="{'criteria_answer_' + index}" type="text" value="{ criteria.prev_answer }">
             </li>
         </ol>
+        <p if="{ definition.criterias.length == 0 && !definition.jupyter_notebook_enabled }">No grading criteria defined for this homework.</p>
     </div>
     <div class="ui form">
         <div class="fields">
diff --git a/templates/base.html b/templates/base.html
index c371c451..a7ed6219 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -121,14 +121,11 @@
                 <a class="ui button" href="{% url "profiles:login" %}">Login</a>
             {% endif %}
         </div>
-
-        <img class="logo" onclick="location.href='/'" alt="chagrade_logo" src="{% static 'images/chagrade_logo.png' %}">
+        <a id="home-logo" class="logo" href="/"></a>
     </div>
 
 </header>
 <div class="ui container">
-
-
     <div class="app">
         <div class="ui segment hide-border">
             <div class="module container-padding">
@@ -205,5 +202,15 @@
 {% block extra_script %}
 {% endblock %}
 
+<style>
+    #home-logo {
+        background-image: url('{% static "images/chagrade_logo.png" %}');
+        background-size: contain;
+        background-repeat: no-repeat;
+        height: 40px;
+        width: 220px;
+    }
+</style>
+
 </body>
 </html>
\ No newline at end of file