diff --git a/media/images/loading.gif b/media/images/loading.gif
new file mode 100644
index 00000000..7eca54a3
Binary files /dev/null and b/media/images/loading.gif differ
diff --git a/media/images/ui-icons_ffffff_256x240.png b/media/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 00000000..42f8f992
Binary files /dev/null and b/media/images/ui-icons_ffffff_256x240.png differ
diff --git a/media/styles/style.css b/media/styles/style.css
index 262a37e4..68286808 100755
--- a/media/styles/style.css
+++ b/media/styles/style.css
@@ -2,10 +2,57 @@
 
 /* @group Global */
 
-/* @group Page Structure */
+/* @group Browser reset */
+
+h1, h2, h3, h4, h5, h6 {
+	margin-bottom: 10px;
+}
+
+h1{
+	font-size: 20px;
+	margin-bottom: 20px;
+}
+h2{
+	font-size: 16px;
+	margin-bottom: 16px;
+}
+
+#help_icon {
+	float: right;
+}
+h3{
+	font-size: 12px;
+}
+
+p, ol, pre, input{
+	margin-bottom: 10px;
+}
+
+pre{
+	left: -14px;
+	padding-left: 20px;
+}
+
+ul li{
+	list-style-type: disc;
+}
+
+ol li{
+	list-style-type: decimal;	
+}
+
+li {
+	padding-left: 20px;
+	margin-bottom: 10px;
+	list-style-position: inside;
+}
+
+/* @end */
+
+/* @group Page structure */
 
 body {
-	background: #FFFFFF none repeat scroll 0 0;
+	background: #fff none repeat scroll 0 0;
 	color: #333333;
 	font-family: "Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
 	font-size: 12px;
@@ -17,7 +64,6 @@ body {
 	position: relative;
 	width: 100%;
 	min-width: 760px;
-	padding: 0;
 }
 
 #content {
@@ -25,8 +71,7 @@ body {
 	margin-right: auto;
 	margin-left: auto;
 	margin-bottom: 10px;
-	padding-right: 20px;
-	padding-bottom: 20px;
+	padding: 20px;
 }
 
 #footer {
@@ -45,44 +90,62 @@ body {
 	width: 100%;
 }
 
-#header a:link, #header a:visited {
-	color: white;
+#sub_header {
+	background: #005094;
+	overflow: hidden;
+	width: 100%;
+	color: #eaeaea;
+	font-size: 11px;
+	padding-top: 3px;
+	padding-bottom: 4px;
 }
 
-#header a:hover {
-	text-decoration: underline;
+.inner {
+	width: 800px;
+	margin-right: auto;
+	margin-left: auto;
+	padding-left: 20px;
+	padding-right: 20px;
 }
 
 #title h1 {
-	padding: 0 10px;
+
 	font-size: 18px;
-	margin: 8px 0;
 	font-weight: normal;
 	color: white;
+	float: left;
+	margin-top: 8px;
+	margin-bottom: 8px;
 }
 
-#title h2 {
-	padding: 0 10px;
-	font-size: 14px;
-	margin: -8px 0 8px 0;
-	font-weight: normal;
-	color: #ffc;
+#user-tools {
+	float: right;
+	margin-top: 12px;
 }
 
-#user-tools {
-	position: absolute;
-	top: 0;
-	right: 0;
-	padding: 1.2em 10px;
-	font-size: 11px;
-	text-align: right;
+#header a:link, #header a:visited{
+	color: white;
+	text-decoration: none;
+}
+
+#sub_header a:link, #sub_header a:visited, #sub_header a{
+	color: #eaeaea;
+	text-decoration: none;
+}
+
+#sub_header a:hover{
+	text-decoration: underline;
+}
+
+#header a:hover{
+	text-decoration: underline;
 }
 
 /* @end */
 
 /* @group Forms */
 
-th {
+form th {
 	text-align: right;
 	vertical-align: top;
 }
@@ -96,6 +159,14 @@ label {
 	font-size: 10pt;
 	font-family: sans-serif;
 	vertical-align: top;
+	float: left;
+	width: 8em;
+	display: block;
+}
+
+form .help{
+	margin-left: 9em;
+	color: #999999;
 }
 
 .errorlist {
@@ -139,6 +210,11 @@ label {
 	background-image: url(../images/ui-icons_c31818_256x240.png);
 }
 
+.icon-white {
+	background-image: url(../images/ui-icons_ffffff_256x240.png);
+}
+
+
 .icon-none {
 	background-image: none !important;
 }
@@ -160,20 +236,90 @@ label {
 
 /* @group Task */
 
+/* @group Task Detail */
+
+#task_detail #submission_date {
+	float: right;
+}
+
+/* @end */
+
 /* @group Task List */
 
-div.left {
+#task_list div.left {
+	float: left;
+	width: 48%;
+	padding-right: 2%;
+}
+
+#task_list div.right {
+	float: right;
+	width: 48%;
+	padding-left: 2%;
+}
+
+
+
+/* @end */
+
+
+
+/* @end */
+
+/* @group Solution */
+
+/* @group Solution Detail */
+
+#solution_detail #commit_text {
+	display: inline;
+}
+
+#solution_detail form  {
+	display: inline;
+}
+
+
+
+/* @end */
+
+/* @group Solution Upload */
+
+#soluion_upload div.left {
 	float: left;
 	width: 48%;
 	padding-right: 2%;
 }
 
-div.right {
+#soluion_upload div.right {
 	float: right;
 	width: 48%;
 	padding-left: 2%;
 }
 
+#soluion_upload div.left a {
+	float: right;
+}
+
+#soluion_upload .simple_overlay {  
+    /* must be initially hidden */ 
+    display:none; 
+          
+    /* styling */ 
+    color:#fff; 
+    width: 30%;     
+    min-height:200px; 
+   	padding:35px;
+	font-size: 20px;
+} 
+
+#soluion_upload img#spinner {
+	display: inline;
+	float: left;
+	position: relative;
+	top: 4px;
+	margin-right: 10px;
+}
+
 
 
 /* @end */
@@ -186,73 +332,77 @@ div.right {
 
 /* @group Attestation Edit */
 
-.activeFile {
+#attestation_edit .activeFile {
 	font-weight: bold;
 }
 
-.ui-tabs .ui-tabs-hide, .hidden {
-	
-
+#attestation_edit .ui-tabs .ui-tabs-hide, .hidden {
 /* override display:none of hidden tab to instantiate bespin 
 	 see http://jqueryui.com/demos/tabs/ */
     position: absolute;
 	left: -10000px;
 }
 
-h3.result {
+#attestation_edit h3.result {
 	text-decoration: none;
 }
 
-div.result span.icon {
+#attestation_edit div.result span.icon {
 	float: left;
 	margin-right: .3em;
 	width: 16px;
 	height: 16px;
 }
 
-.bespin {
+#attestation_edit .bespin {
 	margin: 0;
 	margin-top: 10px;
 	padding: 0;
 	border: 0;
 	height: 500px;
-	border: 10px 
-	solid #ddd;
+	border: 10px solid #ddd;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 }
 
-
-
 /* @end */
 
 /* @group Attestation List */
 
-#comment {
+#attestation_list #comment {
 	color: #c0c0c0;
 	width: 80%;
 	float: right;
 }
 
-div.attestation {
+#attestation_list div.attestation {
 	position: relative;
 	left: 20px;
 }
 
-#Solutions form {
+#attestation_list #Solutions form {
 	margin-top: 40px;
 }
 
+#soluion_upload div.attestation {
+	margin-left: 15px;
+}
+
 
 
 /* @end */
 
 /* @group Attestation View */
 
-div.changed {
+#attestation_view div.changed {
 	background-color: #c4ff6f;
 }
 
+#attestation_view form .help {
+	display: inline;
+	margin-left: 60px;
+}
+
 
 
 /* @end */
diff --git a/src/praktomat/attestation/views.py b/src/praktomat/attestation/views.py
index 3d49759a..967109ad 100755
--- a/src/praktomat/attestation/views.py
+++ b/src/praktomat/attestation/views.py
@@ -29,12 +29,15 @@ def attestation_list(request, task_id):
 	# don't allow a new attestation if one already exists
 	solution_list = map(lambda solution:(solution, not solution.attestations_by(requestuser)), solutions)
 	# first published => all published
-	published = solutions[0].attestations_by(requestuser)[0].published
-	all_solutions_attested = not reduce(lambda x,y: x or y, [new_attest_possible for (solution, new_attest_possible) in solution_list])
+	try:
+		published = solutions[0].attestations_by(requestuser)[0].published
+	except IndexError:
+		published = False
+	all_solutions_attested = not reduce(lambda x,y: x or y, [new_attest_possible for (solution, new_attest_possible) in solution_list], False)
 	all_attestations_final = reduce(lambda x,y: x and y, 
 								map(lambda attestation: attestation.final , 
-									sum([list(solution.attestations_by(requestuser)) for solution in solutions],[])))
-	publishable = all_solutions_attested and all_attestations_final
+									sum([list(solution.attestations_by(requestuser)) for solution in solutions],[])), True)
+	publishable = all_solutions_attested and all_attestations_final and task.expired()
 	if request.method == "POST" and publishable:
 		for solution in solutions:
 			for attestation in solution.attestations_by(requestuser):
diff --git a/src/praktomat/checker/views.py b/src/praktomat/checker/views.py
index 9a572db9..8b137891 100755
--- a/src/praktomat/checker/views.py
+++ b/src/praktomat/checker/views.py
@@ -1,16 +1 @@
-from django.contrib.auth.decorators import login_required
-from django.http import HttpResponse, HttpResponseBadRequest
-from django.views.decorators.cache import never_cache
-from django.utils import simplejson
 
-@login_required
-@never_cache
-def checker_progress(request):
-    """ Return JSON object with information about the progress of the checker run."""
-    try:
-        checker_progress = request.session['checker_progress']
-    except:
-        checker_progress = 0    
-        # return HttpResponseBadRequest('Server Error')    
-    json = simplejson.dumps({'progress': checker_progress})
-    return HttpResponse(json)
diff --git a/src/praktomat/solutions/models.py b/src/praktomat/solutions/models.py
index c2b42c2d..2c6660b4 100755
--- a/src/praktomat/solutions/models.py
+++ b/src/praktomat/solutions/models.py
@@ -35,11 +35,9 @@ def copySolutionFiles(self, toTempDir):
 		for file in self.solutionfile_set.all():
 			file.copyTo(toTempDir)
 	
-	def check(self, session, run_secret = 0): 
+	def check(self, run_secret = 0): 
 		"""Builds and tests this solution."""
 		
-		session['checker_progress'] = 0
-		
 		# Delete previous results if the checker have allready been run
 		self.checkerresult_set.all().delete()
 		# set up environment
@@ -63,7 +61,7 @@ def check(self, session, run_secret = 0):
 			os.makedirs(env.tmpdir(), TMP_DIR_MODE)
 			os.chmod(env.tmpdir(), TMP_DIR_MODE)
 			self.copySolutionFiles(env.tmpdir())
-			self.run_checks(env, session, run_secret)
+			self.run_checks(env, run_secret)
 		finally:
 			# reset default temp dir location 
 			tempfile.tempdir = None
@@ -76,7 +74,7 @@ def check(self, session, run_secret = 0):
 		
 		
 	
-	def run_checks(self, env, session, run_all): # , task
+	def run_checks(self, env, run_all): # , task
 		""" Check program. The case `Nothing submitted' is handled by the Saver.  Also,
 		this does not work when submitting archives, since at this
 		point, archives are not unpacked yet, and hence,
@@ -106,9 +104,6 @@ def run_checks(self, env, session, run_all): # , task
 						task.dejagnusetup_set.all(), 
 						task.dejagnutester_set.all() ]
 		
-		number_of_checkers_total = sum(map(lambda x:x.count(), checkersets))
-		number_of_finished_checkers = 0
-		
 		for checkers in checkersets:
 			for checker in checkers:
 				
@@ -145,11 +140,6 @@ def run_checks(self, env, session, run_all): # , task
 							
 					if result.passed:
 						passed_checkers.append(checker)
-				
-				number_of_finished_checkers += 1 	
-				session['checker_progress'] = int(100.0 * number_of_finished_checkers / number_of_checkers_total)
-				session.save()
-
 		self.save()
 		
 	def attestations_by(self, user):
diff --git a/src/praktomat/solutions/views.py b/src/praktomat/solutions/views.py
index 35751b54..95f8b567 100755
--- a/src/praktomat/solutions/views.py
+++ b/src/praktomat/solutions/views.py
@@ -1,4 +1,3 @@
-from datetime import datetime
 import zipfile
 import tempfile
 
@@ -19,23 +18,16 @@
 def solution_list(request, task_id):
 	task = get_object_or_404(Task,pk=task_id)
 	my_solutions = task.solution_set.filter(author = request.user)
-	submission_possible = task.submission_date > datetime.now()	and not my_solutions.filter(final = True)
+	submission_possible = not task.expired() and not my_solutions.filter(final = True)
 	
 	if request.method == "POST":	
 		solution = Solution(task = task, author=request.user)
 		formset = SolutionFormSet(request.POST, request.FILES, instance=solution)
 		if formset.is_valid():
 			try:
-				request.session['checker_progress'] = 0
-				request.session.save()
 				solution.save()
 				formset.save()
-				solution.check(request.session)
-				# the form's submit targets an iframe, this allaows webkit based browsers (and probably others) to make ajax calls while posting
-				# so we are returning an javascript which will redirect the parent window of the iframe 
-				#import time
-				#time.sleep(600)
-				#return render_to_response("solutions/js_redirect.html", {"redirect_url": reverse('solution_detail', args=[solution.id])}, context_instance=RequestContext(request))
+				solution.check()
 				return HttpResponseRedirect(reverse('solution_detail', args=[solution.id]))
 			except:
 				solution.delete()	# delete files 
diff --git a/src/praktomat/tasks/models.py b/src/praktomat/tasks/models.py
index 6cdb58bf..bffb39e4 100755
--- a/src/praktomat/tasks/models.py
+++ b/src/praktomat/tasks/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.db import transaction
 from django.core import serializers
-from datetime import date, datetime
+from datetime import date, datetime, timedelta
 import tempfile
 import zipfile
 
@@ -23,9 +23,9 @@ def solutions(self,user):
 	def checker(self):
 		return self.AnonymityChecker_set.all() + self.LineCounter_set.all()
 		
-	def expiered(self):
+	def expired(self):
 		"""docstring for expiered"""
-		return self.submission_date + datetime.timedelta(hour=1) > datetime.now()
+		return self.submission_date + timedelta(hours=1) < datetime.now()
 		
 	@classmethod
 	def export_Tasks(cls, qureyset):
diff --git a/src/praktomat/tasks/views.py b/src/praktomat/tasks/views.py
index 84072157..60e73f12 100755
--- a/src/praktomat/tasks/views.py
+++ b/src/praktomat/tasks/views.py
@@ -23,7 +23,7 @@ def taskList(Request):
 	return render_to_response('tasks/task_list.html',{'upcoming_tasks':upcoming_tasks, 'expired_tasks':expired_tasks, 'tutors':tutors}, context_instance=RequestContext(Request))
 	#return object_list(Request, Task.objects.all(), template_object_name='tasks')
 
-#@login_required
+@login_required
 def taskDetail(Request,task_id):
 	my_solutions = Task.objects.get(pk=task_id).solution_set.filter(author = Request.user)
 	return object_detail(Request, Task.objects.all(), task_id, extra_context={'solutions': my_solutions}, template_object_name='task')
diff --git a/src/praktomat/templates/admin/tasks/task/model_solution.html b/src/praktomat/templates/admin/tasks/task/model_solution.html
index 99d42379..139087aa 100755
--- a/src/praktomat/templates/admin/tasks/task/model_solution.html
+++ b/src/praktomat/templates/admin/tasks/task/model_solution.html
@@ -18,16 +18,20 @@
     </div>
 </form>
 
-<div class='module aligned'>
-	<h2>Checker results</h2>
-	{% with task.model_solution.checkerresult_set.all as results %}
-		{% include "solutions/checker_results_inline.html" %}
-	{% endwith %}
-</div>
-<div class='module aligned'>
-	<h2>Files</h2>
-	{% with task.model_solution.solutionfile_set.all as solutionfiles %}
-		{% include "solutions/solution_files_inline.html" %}
-	{% endwith %}
-</div>
+{% if task.model_solution.checkerresult_set %}
+	<div class='module aligned'>
+		<h2>Checker results</h2>
+		{% with task.model_solution.checkerresult_set.all as results %}
+			{% include "solutions/checker_results_inline.html" %}
+		{% endwith %}
+	</div>
+{% endif %}
+{% if task.model_solution.solutionfile_set.all %}
+	<div class='module aligned'>
+		<h2>Files</h2>
+		{% with task.model_solution.solutionfile_set.all as solutionfiles %}
+			{% include "solutions/solution_files_inline.html" %}
+		{% endwith %}
+	</div>
+{% endif %}
 {% endblock %}
diff --git a/src/praktomat/templates/attestation/attestation_edit.html b/src/praktomat/templates/attestation/attestation_edit.html
index a201e9a4..a374f8e4 100755
--- a/src/praktomat/templates/attestation/attestation_edit.html
+++ b/src/praktomat/templates/attestation/attestation_edit.html
@@ -36,9 +36,9 @@
 			$("#file"+index).addClass("activeFile");
 		}
 	</script>
-{% endblock %}{% block content %}
-
-<span class="icon ui-icon-carat-1-w"></span><a href={% url attestation_list solution.task_id %}>{% trans "Back to attestation list" %}</a>
+{% endblock %}
+{% block breadcrumbs %} {{block.super}} > <a href={% url taskDetail task_id=solution.task.id%}>{{solution.task.title}}</a> > <a href={% url attestation_list solution.task_id %}>My attestations</a> > Attestation {% endblock %}
+{% block content %}<div id='attestation_edit'>
 
 <h1>{{solution.task.title}}</h1>
 
@@ -80,11 +80,10 @@ <h1 class="heading">Checker results</h1>
 		
 		<div id="annotated_solution_files">
 			<h1 class="heading">Annotated solution files</h1>
-			{{ attestFileFormSet.non_form_errors }}
 			<div id="file_form_set">
-				<table>
-					{{ attestFileFormSet }}
-				</table>
+				{% with attestFileFormSet as formset %}	
+					{% include "forms/formset_as_div.html" %}
+				{% endwith %}
 			</div>
 			<div id="file_form_set_replacement" class="hidden">
 				{% for file in solution.solutionfile_set.all %}
@@ -97,21 +96,18 @@ <h1 class="heading">Annotated solution files</h1>
 	
 		<div id="attestation">
 			<h1 class="heading">Attestation</h1>
-			<table>
-				{{ attestForm.non_form_errors }}
-				{{ ratingResultFormSet.non_form_errors }}
-				{{ attestForm }}
-				{{ ratingResultFormSet }}
-				<tr>
-					<td></td>
-					<td>
-						<input type="submit" value="Save/Preview"  onclick="loadFileInEditor(1);"/>
-						<input type="button" value="Discard/Back" onClick="parent.location='{% url attestation_list solution.task_id %}'">
-					</td>
-				</tr>
-			</table>
+
+				{% with attestForm as form %}	
+					{% include "forms/form_as_div.html" %}
+				{% endwith %}
+				{% with ratingResultFormSet as formset %}	
+					{% include "forms/formset_as_div.html" %}
+				{% endwith %}
+				<input type="submit" value="Save/Preview"  onclick="loadFileInEditor(1);"/>
+				<input type="button" value="Discard/Back" onClick="parent.location='{% url attestation_list solution.task_id %}'">
+
 		</div>
 	</div>
 	
 </form>	
-{% endblock %}
\ No newline at end of file
+</div>{% endblock %}
\ No newline at end of file
diff --git a/src/praktomat/templates/attestation/attestation_list.html b/src/praktomat/templates/attestation/attestation_list.html
index 6556d871..8838e223 100755
--- a/src/praktomat/templates/attestation/attestation_list.html
+++ b/src/praktomat/templates/attestation/attestation_list.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
-{% load i18n %}{% block content %}
-
-<span class="icon ui-icon-carat-1-w"></span><a href={% url task_list %}>{% trans "Back to task list" %}</a>
+{% load i18n %}
+{% block breadcrumbs %} {{block.super}} > <a href={% url taskDetail task_id=task.id%}>{{task.title}}</a> > Attestations{% endblock %}
+{% block content %}<div id='attestation_list'>
 
 <h1>{{task.title}}</h1>
 
@@ -12,7 +12,7 @@ <h2>{% trans "Solutions ready to be attested" %}</h2>
 		<h3>Solution {{forloop.counter}}</h3>
 		{% for attestation in solution.attestation_set.all %}
 			<div class='attestation'>
-				{%ifequal attestation.author requestuser %} 
+				{% if attestation.author = requestuser %} 
 					{% if attestation.final %}
 						{% if attestation.published %}
 							<span class="icon ui-icon-circle-check icon-green"></span>
@@ -32,7 +32,7 @@ <h3>Solution {{forloop.counter}}</h3>
 							View Attestation by {{author}}
 						{% endblocktrans %}
 					</a>
-				{% endifequal %} 
+				{% endif %} 
 				<span id='comment'>{{ attestation.private_comment|truncatewords:15}}</span>
 				<br/>
 			</div>
@@ -43,6 +43,8 @@ <h3>Solution {{forloop.counter}}</h3>
 				<a href={% url new_attestation solution_id=solution.id%}>{% trans "Add Attestation" %}</a>
 			</div>
 		{% endif %}<br/>
+	{% empty %}
+		<p>There are no solutions yet.</p>
 	{%endfor%}
 	
 	<form enctype="multipart/form-data" method="post" action="">{% csrf_token %}	
@@ -50,10 +52,10 @@ <h3>Solution {{forloop.counter}}</h3>
 		{% if published %}	
 			<span id='comment'>Allready published</span> 
 		{% else %}
-			{% if not publishable %} <span id='comment'>Not all attestations are read to be published.</span> {% endif %}
+			{% if not publishable %} <span id='comment'>Not all attestations are read to be published or the submission deadline isn't reached.</span> {% endif %}
 		{% endif %}
 	</form>
 	
 </div>
 
-{% endblock %}
\ No newline at end of file
+</div>{% endblock %}
\ No newline at end of file
diff --git a/src/praktomat/templates/attestation/attestation_view.html b/src/praktomat/templates/attestation/attestation_view.html
index 5901cf0b..65609419 100755
--- a/src/praktomat/templates/attestation/attestation_view.html
+++ b/src/praktomat/templates/attestation/attestation_view.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load highlight %}{% load i18n  %}
+{% load highlight %}{% load i18n  %}{% load in_group %} 
 {% block extrahead %}{{ block.super }}
 	<link type="text/css" rel="stylesheet" href="{{MEDIA_URL}}/styles/pygments_friendly.css" />
 	<script type="text/javascript">
@@ -11,25 +11,39 @@
 			return false;
 		  });
 	</script>
-{% endblock %}{% block content %}
-
-<span class="icon ui-icon-carat-1-w"></span><a href={% url task_list %}>{% trans "Back to task list" %}</a>
+{% endblock %}
+{% block breadcrumbs %} {{block.super}} > <a href={% url taskDetail task_id=attest.solution.task.id%}>{{attest.solution.task.title}}</a> 
+{% if user|in_group:"Tutor"%}
+	> <a href={% url attestation_list attest.solution.task_id %}>My attestations</a> 
+	> <a href={% url edit_attestation attest.id %}>Attestation</a>
+	> Preview
+{% else %}
+	> <a href={% url solution_list task_id=attest.solution.task.id%}>My solutions</a> 
+	> <a href={% url solution_detail solution_id=attest.solution.id%}>Solution {{attest.solution.id}}</a> 
+	> Attestation {{attest.id}}
+{% endif %}
+{% endblock %}
+{% block content %}<div id='attestation_view'>
 
 <h1>{% trans "Attestation"%}: {{attest.solution.task.title}}</h1>
-<span id='author'>by {{attest.author.get_full_name}}</span>
+<p id='author'>by {{attest.author.get_full_name}}</p>
 
-<h2>Comment</h2>
-<div class="Coment">
-	{{attest.public_comment}}	
-</div>
-
-<h2>Ratings</h2>
-{% for ratingresult in attest.ratingresult_set.all%}
-	<div class="result">
-		<h3 href="#">{{ratingresult.aspect.name}}: {{ratingresult.mark}}</h3>
-		{{ratingresult.aspect.description}}
+{% if attest.public_comment %}
+	<h2>Comment</h2>
+	<div class="Coment">
+		{{attest.public_comment}}	
 	</div>
-{%endfor%}
+{% endif %}
+
+{% if attest.ratingresult_set.all %}
+	<h2>Ratings</h2>
+	{% for ratingresult in attest.ratingresult_set.all%}
+		<div class="result">
+			<h3 href="#">{{ratingresult.aspect.name}}: {{ratingresult.mark}}</h3>
+			{{ratingresult.aspect.description}}
+		</div>
+	{%endfor%}
+{% endif %}
 
 <h2>{% trans "Annotated Files" %}</h2>
 {% for anotfile in attest.annotatedsolutionfile_set.all%}
@@ -39,7 +53,6 @@ <h3 href="#">{{anotfile}}</h3>
 	</div>
 {%endfor%}
 
-
 {% if submitable %}
 	<br/><br/>
 	<form method="post">{% csrf_token %}
diff --git a/src/praktomat/templates/base.html b/src/praktomat/templates/base.html
index 2c3f1178..29f59280 100755
--- a/src/praktomat/templates/base.html
+++ b/src/praktomat/templates/base.html
@@ -4,7 +4,7 @@
 <head>
 	<script type="text/javascript" src="{{MEDIA_URL}}frameworks/jquery/jquery.js"></script>
 	<script type="text/javascript" src="{{MEDIA_URL}}frameworks/jquery/jquery-ui.js"></script>
-	<!-- <link type="text/css" rel="stylesheet" href="{{MEDIA_URL}}styles/reset.css" /> -->
+	<link type="text/css" rel="stylesheet" href="{{MEDIA_URL}}styles/reset.css" />
 	<link type="text/css" rel="stylesheet" href="{{MEDIA_URL}}frameworks/jquery/smoothness/jquery-ui.css" />
 	<link type="text/css" rel="stylesheet" href="{{MEDIA_URL}}styles/style.css" />
 	{% block extrahead %}{% endblock %}	
@@ -13,7 +13,7 @@
 
 <body>
 	<div id="container">
-		<div id="header">
+		<div id="header"><div class="inner">
 			<div id="title">
 				<h1>Praktomat</h1>
 			</div>
@@ -28,7 +28,10 @@ <h1>Praktomat</h1>
 					<a href="{% url registration_register %}">Register</a> 
 				{%endif%}
 			</div>
-		</div>
+		</div></div>
+		<div id="sub_header"><div class="inner">
+			{% block breadcrumbs %}<a href={% url task_list %}><span class="icon icon-white ui-icon-home"></span>Home</a>{% endblock %}
+		</div></div>
 		<div id="content">
 			{% block content %}{% endblock %}
 		</div>
diff --git a/src/praktomat/templates/solutions/js_redirect.html b/src/praktomat/templates/solutions/js_redirect.html
deleted file mode 100755
index 436507f9..00000000
--- a/src/praktomat/templates/solutions/js_redirect.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<script type="text/javascript">
-    	// Redirect window containing iframe to redirect_url
-		top.location.href = "{{ redirect_url }}"
-	</script>
-</head>
-
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/praktomat/templates/solutions/solution_detail.html b/src/praktomat/templates/solutions/solution_detail.html
index 794e382f..91154dad 100755
--- a/src/praktomat/templates/solutions/solution_detail.html
+++ b/src/praktomat/templates/solutions/solution_detail.html
@@ -3,9 +3,9 @@
 {% block extrahead %}{{ block.super }}
 	<script type="text/javascript" src="{{MEDIA_URL}}/script/solution_inlines.js"></script>
 	<link type="text/css" rel="stylesheet" href="{{MEDIA_URL}}/styles/pygments_friendly.css" />
-{% endblock %}{% block content %}
-
-<span class="icon ui-icon-carat-1-w"></span><a href={% url solution_list task_id=solution.task.id%}>{% trans "Back to solution list" %}</a>
+{% endblock %}
+{% block breadcrumbs %} {{block.super}} > <a href={% url taskDetail task_id=solution.task.id%}>{{solution.task.title}}</a> > <a href={% url solution_list task_id=solution.task.id%}>My solutions</a> > Solution {{solution.id}} {% endblock %}
+{% block content %}<div id='solution_detail'>
 
 <h1>{{solution.task.title}}</h1>
 
@@ -13,23 +13,25 @@ <h1>{{solution.task.title}}</h1>
 	<p>You have commited this Solution.</p>
 {% endif %}
 
+{% if submission_possible %}
+	<form method="post">{% csrf_token %}
+		<input type="submit" value="Commit" {% if not solution.accepted %} disabled {% endif %} />
+	</form>
+{% endif %}
+
 {% if solution.accepted %}
 	{% if solution.warnings %}
-		<p class="warning">{% trans "You have passed all required tests." %} 
+		<p class="warning" id='commit_text'>{% trans "You have passed all required tests." %} 
 		{% if submission_possible %}{% trans "Nevertheless you've got at least one warning and should consider correcting it before submitting." %}{% endif %}</p>
 	{% else %}
-		<p class="passed">{% trans "Congratulations you have passed all required tests." %}
+		<p class="passed" id='commit_text'>{% trans "Congratulations you have passed all required tests." %}
 		{% if submission_possible %}{% trans "You can go ahead an make your submission final." %}{% endif %}</p>
 	{% endif %}
 {% else %}
-	<p class="error">{% trans "Sorry, you haven't passed all required tests." %}
+	<p class="error" id='commit_text'>{% trans "Sorry, you haven't passed all required tests." %}
 	{% if submission_possible %}{% trans "Please corect the errors below and try again!" %}{% endif %}</p>
 {% endif %}
-{% if submission_possible %}
-	<form method="post">{% csrf_token %}
-		<input type="submit" value="Commit" /	{% if not solution.accepted %} disabled {% endif %}>
-	</form>
-{% endif %}
+
 
 <h2>{% trans "Results" %}</h2>
 {% with solution.publicCheckerResults as results %}
@@ -41,4 +43,4 @@ <h2>{% trans "Files" %}</h2>
 	{% include "solutions/solution_files_inline.html" %}
 {% endwith %}
 
-{% endblock %}
\ No newline at end of file
+</div>{% endblock %}
\ No newline at end of file
diff --git a/src/praktomat/templates/solutions/solution_list.html b/src/praktomat/templates/solutions/solution_list.html
index db7b37f6..9214fdde 100755
--- a/src/praktomat/templates/solutions/solution_list.html
+++ b/src/praktomat/templates/solutions/solution_list.html
@@ -2,34 +2,11 @@
 {% load i18n %}
 {% block extrahead %}{{ block.super }}
 <script type="text/javascript" src="{{MEDIA_URL}}/frameworks/jquery/jquery.tools.min.js"></script>
-<style>
-/* the overlayed element */ 
-.simple_overlay {  
-    /* must be initially hidden */ 
-    display:none; 
-          
-    /* styling */ 
-    color:#fff; 
-    width:60%;     
-    min-height:200px; 
-   	padding:35px;    
-} 
-</style>
-<script type="text/javascript">		
-// Add upload progress for multipart forms.
-$(function() {
-    $('form[enctype=multipart/form-data]').submit(function(){ 
-        // Prevent multiple submits
-        if ($.data(this, 'submitted')) return false;
 
-        var freq = 500; // freqency of update in ms
-        var progress_url = '{% url checker_progress %}'; // ajax view serving progress info 
-        
-		$("#progressbar").progressbar({
-			value: 0
-		});
-		
-      	$("#progress").overlay({ 
+<script type="text/javascript">	
+$(function(){ 
+	$('form[enctype=multipart/form-data]').submit(function(){ 
+	  	$("#progress").overlay({ 
 	    	top: 272, 
 	    	api: true,
 			closeOnClick: false,
@@ -40,64 +17,38 @@
 	        	opacity: 0.9 
 		    }, 
 		}).load();
-
-        // Update progress bar
-        function update_progress_info() {
-            $.getJSON(progress_url, {}, function(data, status){ 
-                if (data) {
-                    var progresse = parseInt(data.progress);
-                    $('#progressbar div').animate({width: progresse + '%' },{ queue:'false', duration:500, easing:"swing" }); 
-                }
-                window.setTimeout(update_progress_info, freq);
-            });
-        };
-        window.setTimeout(update_progress_info, freq);
-
-        $.data(this, 'submitted', true); // mark form as submitted.
-    });
+	});
 });
 
-</script>
-{% endblock %}{% block content %}
 
+</script>
+{% endblock %}
+{% block breadcrumbs %} {{block.super}} > <a href={% url taskDetail task_id=task.id%}>{{task.title}}</a> > My solutions{% endblock %}
 
-<span class="icon ui-icon-carat-1-w"></span><a href={% url task_list %}>{% trans "Back to task list" %}</a>
+{% block content %}<div id='soluion_upload'>
 
 <h1>{{task.title}}</h1>
 
 <div class='left'>
-	<h2>{%trans "Upload solution" %}</h2> 
 	{% if submission_possible %}
-		<a>{%trans "Time left:" %} {{ task.submission_date|timeuntil }}</a><br/><br/>
-		<iframe name="frame" style="display:none;"></iframe><!--target="frame"-->
+		<a>{%trans "Time left:" %} {{ task.submission_date|timeuntil }}</a>
+		<h2>{%trans "Upload solution" %}</h2>
 		<form enctype="multipart/form-data" method="post" action="" > {% csrf_token %}
-			<table>
-				{{ formset.non_form_errors }}
-				{{ formset }}
-				<tr>
-					<td></td>
-					<td>
-						<input type="submit" value="upload" />
-					</td>
-					
-				</tr>
-			</table>
+			{% include "forms/formset_as_div.html" %}
+			<input type="submit" value="upload" />
 		</form>
 	{% else %}
-		{%trans "You've allreay commited a solution. Therefore resubmission is not possible." %}
+		<h2>{%trans "Upload solution" %}</h2> 
+		{%trans "You've allreay commited a solution or the deadline has past. Therefore (re)submission is not possible." %}
 	{% endif %}
 </div>
 
-
-
-
-
-
-
-
-{% if solutions %}<div class='right'>
+<div class='right'>
+	<div id='help_icon'><span class="icon icon-orange ui-icon-info"></span></div>
+	<div class="tooltip"> 
+    
+	</div> 
 	<h2>{% trans "Submitted solutions" %}</h2>
-	
 	{% for solution in solutions %}
 		<div class='solution'>
 			{% spaceless %} 
@@ -129,14 +80,15 @@ <h2>{% trans "Submitted solutions" %}</h2>
 					<span class="icon ui-icon-script"></span><a href={% url view_attestation attestation_id=attest.id%}>Attestation</a> by {{attest.author.get_full_name}}<br/>
 				{% endif %}
 			</div>
-		{%endfor%}
-		
-	{%endfor%}</div>
-{% endif %}
-
+		{%endfor%}		
+	{% empty %}
+		{%trans "You have't uploaded any solutions jet." %}
+	{%endfor%}
+</div>
 <div class="simple_overlay" id="progress"> 
-    <p>Uploading & testing solution ...</p>
-	<div id="progressbar"></div>
+	<!-- spinner from http://ajaxload.info/ -->
+	<img id="spinner" src="{{MEDIA_URL}}/images/loading.gif" alt="loading" />
+    <p>Please wait while your solution is examined.</p>
 </div> 
 
-{% endblock %}
\ No newline at end of file
+</div>{% endblock %}
\ No newline at end of file
diff --git a/src/praktomat/templates/tasks/task_detail.html b/src/praktomat/templates/tasks/task_detail.html
index 6fe870d9..a5760a35 100755
--- a/src/praktomat/templates/tasks/task_detail.html
+++ b/src/praktomat/templates/tasks/task_detail.html
@@ -3,15 +3,23 @@
 {% block extrahead %}{{ block.super }}
 <link type="text/css" rel="stylesheet" href="{{MEDIA_URL}}/styles/pygments_friendly.css" />
 {% endblock %}
-{% block content %}
-
-<span class="icon ui-icon-carat-1-w"></span><a href={% url task_list %}>{% trans "Back to task list" %}</a>
+{% block breadcrumbs %}
+	{{ block.super }} > {{task.title}}
+{% endblock %}
+{% block content %}<div id='task_detail'>
+<span id="submission_date">
+	Submission date: {{task.submission_date.date}}
+</span>
 
 <h1>{{task.title}}</h1>
-<span id="subtitle">{% blocktrans with task.publication_date.date as pub_date and task.submission_date.date as sub_date %}
-	Publication date: {{pub_date}}, Submission date: {{sub_date}}
-{% endblocktrans %}</span>
 
+<p>
+{% if user|in_group:"Tutor"%}
+	<span class="icon ui-icon-triangle-1-e"></span><a href={% url attestation_list task_id=task.id%}>{% trans "My Attestations" %}</a>
+{% endif %}
+{% if user|in_group:"User"%}
+	<span class="icon ui-icon-triangle-1-e"></span><a href={% url solution_list task_id=task.id%}>{% trans "My Solutions" %}</a>
+{% endif %}<p>
 {{task.description|markdown:"codehilite"}}
 
-{% endblock %}
+<div>{% endblock %}
diff --git a/src/praktomat/templates/tasks/task_list.html b/src/praktomat/templates/tasks/task_list.html
index 64a72111..491a03f3 100755
--- a/src/praktomat/templates/tasks/task_list.html
+++ b/src/praktomat/templates/tasks/task_list.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %} {% load in_group %} {% load chunks %}
-{% block content %}
+{% block breadcrumbs %}<span class="icon icon-white ui-icon-home"></span>Home{% endblock %}
+{% block content %}<div id='task_list'>
 
 <div id="welcome">
 	<h1>{% trans "Welcome" %}, {% firstof user.get_full_name user.username %}!</h1>
@@ -20,7 +21,7 @@ <h2><a href={% url taskDetail task_id=task.id%}>{{task.title}}</a></h2>
 			{% if user|in_group:"User" %}
 				<a href={% url solution_list task_id=task.id%}>{% trans "Solutions"%}</a>
 			{% endif %}
-			{% if user.is_superuser or user|in_group:"Tutor"%}
+			{% if user|in_group:"Tutor"%}
 				<a href={% url attestation_list task_id=task.id%}>{% trans "Attestation"%}</a>
 			{% endif %}
 			{% if user.is_superuser or user|in_group:"Trainer"%}
@@ -40,7 +41,7 @@ <h2><a href={% url taskDetail task_id=task.id%}>{{task.title}}</a></h2>
 			{% if user|in_group:"User" %}
 				<a href={% url solution_list task_id=task.id%}>{% trans "Solutions"%}</a>
 			{% endif %}
-			{% if user.is_superuser or user|in_group:"Tutor"%}
+			{% if user|in_group:"Tutor"%}
 				<a href={% url attestation_list task_id=task.id%}>{% trans "Attestation"%}</a>
 			{% endif %}
 			{% if user.is_superuser or user|in_group:"Trainer"%}
@@ -54,4 +55,4 @@ <h2><a href={% url taskDetail task_id=task.id%}>{{task.title}}</a></h2>
 
 
 
-{% endblock %}
\ No newline at end of file
+</div>{% endblock %}
\ No newline at end of file
diff --git a/src/praktomat/urls.py b/src/praktomat/urls.py
index 36f7045d..cd6cc71d 100755
--- a/src/praktomat/urls.py
+++ b/src/praktomat/urls.py
@@ -31,7 +31,6 @@
 	url(r'^solutions/(?P<solution_id>\d+)/$', 'praktomat.solutions.views.solution_detail', name='solution_detail'),
 	url(r'^solutions/(?P<solution_id>\d+)/attestation/$', 'praktomat.attestation.views.new_attestation', name='new_attestation'),
 	url(r'^tasks/(?P<task_id>\d+)/solutionupload/$', 'praktomat.solutions.views.solution_list', name='solution_list'),
-	url(r'^checkerprogress/$', 'praktomat.checker.views.checker_progress', name='checker_progress'),
 
 	#Attestation
 	url(r'^tasks/(?P<task_id>\d+)/attestation/statistics$', 'praktomat.attestation.views.statistics', name='statistics'),