diff --git a/application/controllers/admin/parameters.php b/application/controllers/admin/parameters.php
index a92f218..3061083 100644
--- a/application/controllers/admin/parameters.php
+++ b/application/controllers/admin/parameters.php
@@ -52,11 +52,11 @@ class Parameters extends Admin_Controller {
 		}
 
 		if ($this->form_validation->run('parameters/create') === true) {
-			$paramName = $this->input->post('name');
+			$parameter = $this->input->post('name');
 
 			$data = array(
 				'program_id' => $program['id'],
-				'name' => $paramName,
+				'name' => $parameter,
 				'readable' => $this->input->post('readable'),
 				'unit' => $this->input->post('unit'),
 				'description' => $this->input->post('description'),
@@ -65,7 +65,7 @@ class Parameters extends Admin_Controller {
 			);
 
 			if ($this->parameter->create($data)) {
-				$this->messages->add(sprintf(_("The parameter '%s' has been successfully created."), $paramName), 'success');
+				$this->messages->add(sprintf(_("The parameter "%s" has been created successfully."), $parameter), 'success');
 				redirect('admin/programs/edit/' . $program['id'], 303);
 			}
 		}
@@ -148,13 +148,14 @@ class Parameters extends Admin_Controller {
 			);
 
 			if ($this->parameter->update($data, $id)) {
-				$this->messages->add(sprintf(_("The parameter '%s' has been successfully updated."), $parameter['name']), 'success');
-				redirect('admin/programs/edit/' . $parameter['program_id'], 303);
+				$this->messages->add(sprintf(_("The parameter "%s" has been updated successfully."), $parameter['name']), 'success');
 			}
+			redirect('admin/programs/edit/' . $parameter['program_id'], 303);
 		}
 
 		$data = array(); // empty the data array
 		$data['types'] = $this->parameter->getTypes();
+		$data['program'] = $this->program->getByID($parameter['program_id']);
 		$data['parameter'] = $parameter;
 
 		$this->load->view('admin/parameters/edit', $data);
@@ -172,7 +173,7 @@ class Parameters extends Admin_Controller {
 			show_404();
 		} else {
 			if ($this->parameter->delete($parameter['id'])) {
-				$this->messages->add(_('The selected parameter has been successfully deleted.'), 'success');
+				$this->messages->add(_("The selected parameter has been deleted successfully."), 'success');
 			}
 			redirect('admin/programs/edit/' . $parameter['program_id'], 303);
 		}
diff --git a/application/controllers/admin/programs.php b/application/controllers/admin/programs.php
index 3c491a7..9aa154f 100644
--- a/application/controllers/admin/programs.php
+++ b/application/controllers/admin/programs.php
@@ -52,10 +52,10 @@ class Programs extends Admin_Controller {
 	 *
 	 * @param string $id
 	 */
-	public function edit($id = '') {
-		$program = $this->program->getByID($id);
+	public function edit($programId = '') {
+		$program = $this->program->getByID($programId);
 
-		if (empty($id) || !isset($program['id'])){
+		if (empty($programId) || !isset($program['id'])){
 			show_404();
 		}
 
@@ -64,12 +64,13 @@ class Programs extends Admin_Controller {
 				'name' => $this->input->post('name'),
 				'config_template' => $_POST['config_template'],
 			);
-			if ($this->program->update($data, $id)) {
-				$this->messages->add(sprintf(_("The program '%s' has been updated successfully"), $this->input->post('name')), 'success');
-				redirect('admin/programs', 303);
+			if ($this->program->update($data, $programId)) {
+				$this->messages->add(sprintf(_("The program "%s" has been updated successfully"), $this->input->post('name')), 'success');
+				redirect('admin/programs/edit/' . $program['id'], 303);
 			}
 		}
 
+		$data = array(); // empty data array
 		$data['program'] = $program;
 		$data['parameters'] = $this->parameter->getAll($program['id']);
 
diff --git a/application/views/admin/parameters/create.php b/application/views/admin/parameters/create.php
index 2aca436..1d1b811 100644
--- a/application/views/admin/parameters/create.php
+++ b/application/views/admin/parameters/create.php
@@ -3,28 +3,45 @@
 <div id="content">
 
 	<div class="title">
-		<h2><?=_('Add a new parameter');?></h2>
+		<h2><?=anchor('admin/programs', _('Programs'));?> &raquo; <?=anchor('admin/programs/edit/' . $program['id'], $program['name']);?> &raquo; <?=_('Add a new parameter');?></h2>
 	</div>
 
 	<div class="box">
 		<form name="addParameter" method="post" action="<?=site_url('admin/parameters/create/' . $program['id']);?>">
+			<h3><?=_('Required information');?></h3>
 			<ul>
 				<li>
-					<?=form_label(_('Name'), 'name');?>
-					<span class="req">*</span>
+					<?=form_label(_('Name'), 'name');?> <span class="req">*</span>
 					<div>
 						<input type="text" name="name" id="name" class="short text" value="<?=set_value('name');?>" />
 						<?=form_error('name');?>
 					</div>
 				</li>
 				<li>
-					<?=form_label(_('Human-readable name'), 'readable');?>
-					<span class="req">*</span>
+					<?=form_label(_('Human-readable name'), 'readable');?> <span class="req">*</span>
 					<div>
 						<input type="text" name="readable" id="readable" class="medium text" value="<?=set_value('readable');?>" />
 						<?=form_error('readable');?>
 					</div>
 				</li>
+				<li>
+					<?=form_label(_('Type'), 'type');?> <span class="req">*</span>
+					<div>
+						<select name="type" id="type" class="drop">
+<?php
+	foreach ($types as $type):
+?>
+							<option value="<?=$type;?>" <?=set_select('type', $type);?>><?=$type;?></option>
+<?php
+	endforeach;
+?>
+						</select>
+						<?=form_error('type');?>
+					</div>
+				</li>
+			</ul>
+			<h3><?=_('Optional information');?></h3>
+			<ul>
 				<li>
 					<?=form_label(_('Unit'), 'unit');?>
 					<div>
@@ -39,22 +56,6 @@
 						<?=form_error('description');?>
 					</div>
 				</li>
-				<li>
-					<?=form_label(_('Type'), 'type');?>
-					<span class="req">*</span>
-					<div>
-						<select name="type" id="type" class="drop">
-<?php
-	foreach ($types as $type):
-?>
-							<option value="<?=$type;?>" <?=set_select('type', $type);?>><?=$type;?></option>
-<?php
-	endforeach;
-?>
-						</select>
-						<?=form_error('type');?>
-					</div>
-				</li>
 				<li>
 					<?=form_label(_('Default value'), 'default_value');?>
 					<div>
@@ -64,7 +65,8 @@
 				</li>
 			</ul>
 			<p>
-				<a class="button save" href="javascript:void(0);" onclick="$('form[name=addParameter]').submit();"><?=_('Save');?></a>
+				<a href="javascript:void(0);" onclick="$('form[name=addParameter]').submit();" class="button save"><?=_('Save');?></a>
+				<a href="<?=site_url('admin/programs/edit/' . $program['id']);?>" class="button cancel"><?=_('Cancel');?></a>
 			</p>
 		</form>
 	</div>
diff --git a/application/views/admin/parameters/edit.php b/application/views/admin/parameters/edit.php
index 1c233b4..b764b9a 100644
--- a/application/views/admin/parameters/edit.php
+++ b/application/views/admin/parameters/edit.php
@@ -3,28 +3,45 @@
 <div id="content">
 
 	<div class="title">
-		<h2><?php printf(_("Edit parameter '%s'"), $parameter['name']);?></h2>
+		<h2><?=anchor('admin/programs', _('Programs'));?> &raquo; <?=anchor('admin/programs/edit/' . $program['id'], $program['name']);?> &raquo; <?=sprintf(_('Edit parameter &quot;%s&quot;'), $parameter['name']);?></h2>
 	</div>
 
 	<div class="box">
 		<form name="editParameter" method="post" action="<?=site_url('admin/parameters/edit/' . $parameter['id']);?>">
+			<h3><?=_('Required information');?></h3>
 			<ul>
 				<li>
-					<?=form_label(_('Name'), 'name');?>
-					<span class="req">*</span>
+					<?=form_label(_('Name'), 'name');?> <span class="req">*</span>
 					<div>
 						<input type="text" name="name" id="name" class="short text" value="<?=set_value('name', $parameter['name']);?>" />
 						<?=form_error('name');?>
 					</div>
 				</li>
 				<li>
-					<?=form_label(_('Human-readable name'), 'readable');?>
-					<span class="req">*</span>
+					<?=form_label(_('Human-readable name'), 'readable');?> <span class="req">*</span>
 					<div>
 						<input type="text" name="readable" id="readable" class="medium text" value="<?=set_value('readable', $parameter['readable']);?>" />
 						<?=form_error('readable');?>
 					</div>
 				</li>
+				<li>
+					<?=form_label(_('Type'), 'type');?> <span class="req">*</span>
+					<div>
+						<select name="type" id="type" class="drop">
+<?php
+	foreach ($types as $type):
+?>
+							<option value="<?=$type;?>" <?=set_select('type', $type, $parameter['type'] == $type);?>><?=$type;?></option>
+<?php
+	endforeach;
+?>
+						</select>
+						<?=form_error('type');?>
+					</div>
+				</li>
+			</ul>
+			<h3><?=_('Optional information');?></h3>
+			<ul>
 				<li>
 					<?=form_label(_('Unit'), 'unit');?>
 					<div>
@@ -39,22 +56,6 @@
 						<?=form_error('description');?>
 					</div>
 				</li>
-				<li>
-					<?=form_label(_('Type'), 'type');?>
-					<span class="req">*</span>
-					<div>
-						<select name="type" id="type" class="drop">
-<?php
-	foreach ($types as $type):
-?>
-							<option value="<?=$type;?>" <?=set_select('type', $type, $parameter['type'] == $type);?>><?=$type;?></option>
-<?php
-	endforeach;
-?>
-						</select>
-						<?=form_error('type');?>
-					</div>
-				</li>
 				<li>
 					<?=form_label(_('Default value'), 'default_value');?>
 					<div>
@@ -64,8 +65,8 @@
 				</li>
 			</ul>
 			<p>
-				<a class="button save" href="javascript:void(0);" onclick="$('form[name=editParameter]').submit();"><?=_('Save');?></a>
-				<a class="button cancel" href="<?=site_url('admin/programs/edit/' . $parameter['program_id']);?>"><?=_('Cancel');?></a>
+				<a href="javascript:void(0);" onclick="$('form[name=editParameter]').submit();" class="button save"><?=_('Save');?></a>
+				<a href="<?=site_url('admin/programs/edit/' . $parameter['program_id']);?>" class="button cancel"><?=_('Cancel');?></a>
 			</p>
 		</form>
 	</div>
diff --git a/application/views/admin/programs/edit.php b/application/views/admin/programs/edit.php
index dcc2213..7120641 100644
--- a/application/views/admin/programs/edit.php
+++ b/application/views/admin/programs/edit.php
@@ -16,7 +16,7 @@ $(document).ready(function() {
 	<div id="debug"></div>
 
 	<div class="title">
-		<h2><?php printf(_("Edit program '%s'"), $program['name']);?></h2>
+		<h2><?=anchor('admin/programs', _('Programs'));?> &raquo; <?=sprintf(_("Edit program &quot;%s&quot;"), $program['name']);?></h2>
 	</div>
 
 	<div class="box">
@@ -24,16 +24,14 @@ $(document).ready(function() {
 			<h3><?=_('Required information');?></h3>
 			<ul>
 				<li>
-					<?=form_label(_('Name of the program'), 'name');?>
-					<span class="req">*</span>
+					<?=form_label(_('Name of the program'), 'name');?> <span class="req">*</span>
 					<div>
 						<input type="text" name="name" id="name" class="medium text" value="<?=set_value('name', $program['name']);?>" />
 						<?=form_error('name')?>
 					</div>
 				</li>
 				<li>
-					<?=form_label(_('Config template'), 'config_template');?>
-					<span class="req">*</span>
+					<?=form_label(_('Config template'), 'config_template');?> <span class="req">*</span>
 					<div>
 						<textarea name="config_template" id="config_template" rows="6" cols="60" class="textarea"><?=set_value('config_template', $program['config_template']);?></textarea>
 						<?=form_error('config_template')?>
@@ -47,11 +45,13 @@ $(document).ready(function() {
 				</li>
 			</ul>
 			<p>
-				<a class="button save" href="javascript:void(0);" onclick="$('form[name=editProgram]').submit();"><?=_('Save');?></a>
-				<a class="button cancel" href="<?=site_url('admin/programs');?>"><?=_('Cancel');?></a>
+				<a href="javascript:void(0);" onclick="$('form[name=editProgram]').submit();" class="button save"><?=_('Save');?></a>
+				<a href="<?=site_url('admin/programs');?>" class="button cancel"><?=_('Cancel');?></a>
 			</p>
 		</form>
+	</div>
 
+	<div class="box">
 		<h3><?=_('Parameters');?></h3>
 		<table class="tableList sortable" id="parameters">
 			<thead>
@@ -80,22 +80,28 @@ $(document).ready(function() {
 			</tbody>
 		</table>
 		<p>
-			<a class="button add" href="<?=site_url('admin/parameters/create/' . $program['id']);?>"><?=_('Add new parameter');?></a>
+			<label class="note"><?=_('Entries of this table are draggable.');?></label>
+		</p>
+
+		<h3><?=_('Actions');?></h3>
+		<p>
+			<a class="button parameter_add" href="<?=site_url('admin/parameters/create/' . $program['id']);?>"><?=_('Add parameter');?></a>
 		</p>
 
 		<form name="uploadCSV" method="post" action="<?=site_url('admin/parameters/upload_csv/' . $program['id'])?>" enctype="multipart/form-data">
-		<ul>
-			<li>
-				<?=form_label(_('CSV file'), 'csv_file');?>
-				<div>
-					<input type="file" name="csv_file" id="csv_file" class="file" />
-					<?=form_error('csv_file')?>
-				</div>
-				<label class="note">You can upload a CSV file, containing a bunch of parameters. The rows of the file must be in the following format: <em>parameter name, human-readable name, unit, type, default value, description</em>. The first row is reserved for headlines.</label>
-			</li>
-		</ul>
+			<ul>
+				<li>
+					<?=form_label(_('CSV file'), 'csv_file');?>
+					<div>
+						<input type="file" name="csv_file" id="csv_file" class="file" />
+						<?=form_error('csv_file');?>
+					</div>
+					<label class="note"><?=_('You can upload a CSV file, containing a bunch of parameters.');?> <?=anchor('uploads/csv_template.csv', _('Here you can download a template.'));?></label>
+				</li>
+			</ul>
+		</form>
 		<p>
-			<a class="button upload" href="javascript:void(0);" onclick="$('form[name=uploadCSV]').submit();"><?=_('Upload');?></a>
+			<a href="javascript:void(0);" onclick="$('form[name=uploadCSV]').submit();" class="button upload"><?=_('Upload');?></a>
 		</p>
 	</div>
 </div>
diff --git a/application/views/admin/programs/list.php b/application/views/admin/programs/list.php
index 19f9e1f..80a803c 100644
--- a/application/views/admin/programs/list.php
+++ b/application/views/admin/programs/list.php
@@ -8,7 +8,7 @@
 
 	<div class="box">
 		<h3><?=_('Available programs');?></h3>
-		<table class="tableList paginated">
+		<table class="tableList">
 			<thead>
 				<tr>
 					<th scope="col"><?=_('Name');?></th>
@@ -21,15 +21,20 @@
 ?>
 				<tr>
 					<td><?=$program['name'];?></td>
-					<td><?=anchor('admin/programs/edit/' . $program['id'], _('Edit'));?> | <a href="javascript:deleteConfirm('<?=site_url('admin/programs/delete/' . $program['id']);?>');"><?=_('Delete');?></a></td>
+					<td>
+						<?=anchor('admin/programs/edit/' . $program['id'], _('Edit'));?> |
+						<a href="javascript:deleteConfirm('<?=site_url('admin/programs/delete/' . $program['id']);?>');"><?=_('Delete');?></a>
+					</td>
 				</tr>
 <?php
 	endforeach;
 ?>
 			</tbody>
 		</table>
-
-		<p><a class="button add" href="<?=site_url('admin/programs/create')?>"><?=_('Add program')?></a>
+		<h3><?=_('Actions');?></h3>
+		<p>
+			<a class="button disabled program_add"><?=_('Add program');?></a>
+		</p>
 	</div>
 </div>
 
diff --git a/assets/css/style.css b/assets/css/style.css
index 0e06d0d..1df8f6e 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -590,6 +590,16 @@ a.user_add {
 	padding-left: 30px;
 }
 
+a.program_add {
+	background: url(../images/icons/application--plus.png) 10px center no-repeat #f3f3f3;
+	padding-left: 30px;
+}
+
+a.parameter_add {
+	background: url(../images/icons/ui-text-field--plus.png) 10px center no-repeat #f3f3f3;
+	padding-left: 30px;
+}
+
 a.results {
 	background: url(../images/icons/blue-folder-open-document-text.png) 10px center no-repeat #f3f3f3;
 	padding-left: 30px;
diff --git a/assets/images/icons/ui-text-field--plus.png b/assets/images/icons/ui-text-field--plus.png
new file mode 100644
index 0000000..9b99930
Binary files /dev/null and b/assets/images/icons/ui-text-field--plus.png differ