diff --git a/core/database.class.php b/core/database.class.php
index 14bac1af..eb00e1ab 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -271,13 +271,13 @@ class Database {
 
 	/**
 	 * Meta info about the database engine
-     * @var DBEngine
+	 * @var DBEngine
 	 */
 	private $engine = null;
 
 	/**
 	 * The currently active cache engine
-     * @var CacheEngine
+	 * @var CacheEngine
 	 */
 	public $cache = null;
 
diff --git a/core/extension.class.php b/core/extension.class.php
index bce72590..9d881c80 100644
--- a/core/extension.class.php
+++ b/core/extension.class.php
@@ -140,8 +140,8 @@ abstract class FormatterExtension extends Extension {
  */
 abstract class DataHandlerExtension extends Extension {
 	public function onDataUpload(DataUploadEvent $event) {
-        $supported_ext = $this->supported_ext($event->type);
-        $check_contents = $this->check_contents($event->tmpname);
+		$supported_ext = $this->supported_ext($event->type);
+		$check_contents = $this->check_contents($event->tmpname);
 		if($supported_ext && $check_contents) {
 			if(!move_upload_to_archive($event)) return;
 			send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
diff --git a/core/user.class.php b/core/user.class.php
index 110774c5..3adceadc 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -15,9 +15,9 @@ class User {
 	var $name;
 	var $email;
 	var $join_date;
-    var $passhash;
+	var $passhash;
 
-    /* @var UserClass */
+	/* @var UserClass */
 	var $class;
 
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/core/util.inc.php b/core/util.inc.php
index 6bda7f04..587f66a0 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -1282,7 +1282,7 @@ function _sanitise_environment() {
 }
 
 function _get_themelet_files($_theme) {
-    $base_themelets = array();
+	$base_themelets = array();
 	if(file_exists('themes/'.$_theme.'/custompage.class.php')) $base_themelets[] = 'themes/'.$_theme.'/custompage.class.php';
 	$base_themelets[] = 'themes/'.$_theme.'/layout.class.php';
 	$base_themelets[] = 'themes/'.$_theme.'/themelet.class.php';
diff --git a/ext/artists/theme.php b/ext/artists/theme.php
index 3fddc369..c6d957a3 100644
--- a/ext/artists/theme.php
+++ b/ext/artists/theme.php
@@ -17,7 +17,7 @@ class ArtistsTheme extends Themelet {
 	public function sidebar_options(/*string*/ $mode, $artistID=NULL, $is_admin=FALSE){
 		global $page, $user;
 
-        $html = "";
+		$html = "";
 
 		if($mode == "neutral"){
 			$html = "<form method='post' action='".make_link("artist/new_artist")."'>
@@ -65,51 +65,51 @@ class ArtistsTheme extends Themelet {
 						</form>";
 		}
 
-        if($html) $page->add_block(new Block("Manage Artists", $html, "left", 10));
+		if($html) $page->add_block(new Block("Manage Artists", $html, "left", 10));
 	}
 
-        public function show_artist_editor($artist, $aliases, $members, $urls)
-        {
-            global $user;
+		public function show_artist_editor($artist, $aliases, $members, $urls)
+		{
+			global $user;
 
-            $artistName = $artist['name'];
-            $artistNotes = $artist['notes'];
-            $artistID = $artist['id'];
+			$artistName = $artist['name'];
+			$artistNotes = $artist['notes'];
+			$artistID = $artist['id'];
 
-            // aliases
-            $aliasesString = "";
-            $aliasesIDsString = "";
-            foreach ($aliases as $alias)
-            {
-                $aliasesString .= $alias["alias_name"]." ";
-                $aliasesIDsString .= $alias["alias_id"]." ";
-            }
-            $aliasesString = rtrim($aliasesString);
-            $aliasesIDsString = rtrim($aliasesIDsString);
+			// aliases
+			$aliasesString = "";
+			$aliasesIDsString = "";
+			foreach ($aliases as $alias)
+			{
+				$aliasesString .= $alias["alias_name"]." ";
+				$aliasesIDsString .= $alias["alias_id"]." ";
+			}
+			$aliasesString = rtrim($aliasesString);
+			$aliasesIDsString = rtrim($aliasesIDsString);
 
-            // members
-            $membersString = "";
-            $membersIDsString = "";
-            foreach ($members as $member)
-            {
-                $membersString .= $member["name"]." ";
-                $membersIDsString .= $member["id"]." ";
-            }
-            $membersString = rtrim($membersString);
-            $membersIDsString = rtrim($membersIDsString);
+			// members
+			$membersString = "";
+			$membersIDsString = "";
+			foreach ($members as $member)
+			{
+				$membersString .= $member["name"]." ";
+				$membersIDsString .= $member["id"]." ";
+			}
+			$membersString = rtrim($membersString);
+			$membersIDsString = rtrim($membersIDsString);
 
-            // urls
-            $urlsString = "";
-            $urlsIDsString = "";
-            foreach ($urls as $url)
-            {
-                $urlsString .= $url["url"]."\n";
-                $urlsIDsString .= $url["id"]." ";
-            }
-            $urlsString = substr($urlsString, 0, strlen($urlsString) -1);
-            $urlsIDsString = rtrim($urlsIDsString);
+			// urls
+			$urlsString = "";
+			$urlsIDsString = "";
+			foreach ($urls as $url)
+			{
+				$urlsString .= $url["url"]."\n";
+				$urlsIDsString .= $url["id"]." ";
+			}
+			$urlsString = substr($urlsString, 0, strlen($urlsString) -1);
+			$urlsIDsString = rtrim($urlsIDsString);
 
-            $html =
+			$html =
 '
 			<form method="POST" action="'.make_link("artist/edited/".$artist['id']).'">
 				'.$user->get_auth_html().'
@@ -126,113 +126,113 @@ class ArtistsTheme extends Themelet {
 					<tr><td colspan="2"><input type="submit" value="Submit" /></td></tr>
 				</table>
 			</form>
-                
+				
 ';
 
-            global $page;
-            $page->add_block(new Block("Edit artist", $html, "main", 10));
-        }
+			global $page;
+			$page->add_block(new Block("Edit artist", $html, "main", 10));
+		}
 	
 	public function new_artist_composer()
-        {
-            global $page, $user;
+		{
+			global $page, $user;
 
-            $html = "<form action=".make_link("artist/create")." method='POST'>
+			$html = "<form action=".make_link("artist/create")." method='POST'>
 							".$user->get_auth_html()."
-                            <table>
-                                    <tr><td>Name:</td><td><input type='text' name='name' /></td></tr>
-                                    <tr><td>Aliases:</td><td><input type='text' name='aliases' /></td></tr>
-                                    <tr><td>Members:</td><td><input type='text' name='members' /></td></tr>
-                                    <tr><td>URLs:</td><td><textarea name='urls'></textarea></td></tr>
+							<table>
+									<tr><td>Name:</td><td><input type='text' name='name' /></td></tr>
+									<tr><td>Aliases:</td><td><input type='text' name='aliases' /></td></tr>
+									<tr><td>Members:</td><td><input type='text' name='members' /></td></tr>
+									<tr><td>URLs:</td><td><textarea name='urls'></textarea></td></tr>
 									<tr><td>Notes:</td><td><textarea name='notes'></textarea></td></tr>
-                                    <tr><td colspan='2'><input type='submit' value='Submit' /></td></tr>
-                            </table>
-            ";
+									<tr><td colspan='2'><input type='submit' value='Submit' /></td></tr>
+							</table>
+			";
 
-            $page->set_title("Artists");
-            $page->set_heading("Artists");
-            $page->add_block(new Block("Artists", $html, "main", 10));
+			$page->set_title("Artists");
+			$page->set_heading("Artists");
+			$page->add_block(new Block("Artists", $html, "main", 10));
 	}
 	
 	public function list_artists($artists, $pageNumber, $totalPages)
-        {
-            global $user, $page;
+		{
+			global $user, $page;
 
-            $html = "<table id='poolsList' class='zebra'>".
-                    "<thead><tr>".
-                    "<th>Name</th>".
-                    "<th>Type</th>".
-                    "<th>Last updater</th>".
-                    "<th>Posts</th>";
+			$html = "<table id='poolsList' class='zebra'>".
+					"<thead><tr>".
+					"<th>Name</th>".
+					"<th>Type</th>".
+					"<th>Last updater</th>".
+					"<th>Posts</th>";
 
 
-            if(!$user->is_anonymous()) $html .= "<th colspan='2'>Action</th>"; // space for edit link
-            
-            $html .= "</tr></thead>";
+			if(!$user->is_anonymous()) $html .= "<th colspan='2'>Action</th>"; // space for edit link
+			
+			$html .= "</tr></thead>";
 
-            $deletionLinkActionArray =
-                array('artist' => 'artist/nuke/'
-                    , 'alias' => 'artist/alias/delete/'
-                    , 'member' => 'artist/member/delete/'
-                );
+			$deletionLinkActionArray =
+				array('artist' => 'artist/nuke/'
+					, 'alias' => 'artist/alias/delete/'
+					, 'member' => 'artist/member/delete/'
+				);
 
-            $editionLinkActionArray =
-                array('artist' => 'artist/edit/'
-                    , 'alias' => 'artist/alias/edit/'
-                    , 'member' => 'artist/member/edit/'
-                );
+			$editionLinkActionArray =
+				array('artist' => 'artist/edit/'
+					, 'alias' => 'artist/alias/edit/'
+					, 'member' => 'artist/member/edit/'
+				);
 
-            $typeTextArray =
-                array('artist' => 'Artist'
-                    , 'alias' => 'Alias'
-                    , 'member' => 'Member'
-                );
+			$typeTextArray =
+				array('artist' => 'Artist'
+					, 'alias' => 'Alias'
+					, 'member' => 'Member'
+				);
 
-            foreach ($artists as $artist) {
-                if ($artist['type'] != 'artist')
-                    $artist['name'] = str_replace("_", " ", $artist['name']);
+			foreach ($artists as $artist) {
+				if ($artist['type'] != 'artist')
+					$artist['name'] = str_replace("_", " ", $artist['name']);
 
-                $elementLink = "<a href='".make_link("artist/view/".$artist['artist_id'])."'>".str_replace("_", " ", $artist['name'])."</a>";
-                //$artist_link = "<a href='".make_link("artist/view/".$artist['artist_id'])."'>".str_replace("_", " ", $artist['artist_name'])."</a>";
-                $user_link = "<a href='".make_link("user/".$artist['user_name'])."'>".$artist['user_name']."</a>";
-                $edit_link = "<a href='".make_link($editionLinkActionArray[$artist['type']].$artist['id'])."'>Edit</a>";
-                $del_link = "<a href='".make_link($deletionLinkActionArray[$artist['type']].$artist['id'])."'>Delete</a>";
+				$elementLink = "<a href='".make_link("artist/view/".$artist['artist_id'])."'>".str_replace("_", " ", $artist['name'])."</a>";
+				//$artist_link = "<a href='".make_link("artist/view/".$artist['artist_id'])."'>".str_replace("_", " ", $artist['artist_name'])."</a>";
+				$user_link = "<a href='".make_link("user/".$artist['user_name'])."'>".$artist['user_name']."</a>";
+				$edit_link = "<a href='".make_link($editionLinkActionArray[$artist['type']].$artist['id'])."'>Edit</a>";
+				$del_link = "<a href='".make_link($deletionLinkActionArray[$artist['type']].$artist['id'])."'>Delete</a>";
 
-                $html .= "<tr>".
-                    "<td class='left'>".$elementLink;
+				$html .= "<tr>".
+					"<td class='left'>".$elementLink;
 
-                //if ($artist['type'] == 'member')
-                //    $html .= " (member of ".$artist_link.")";
+				//if ($artist['type'] == 'member')
+				//	$html .= " (member of ".$artist_link.")";
 
-                //if ($artist['type'] == 'alias')
-                //    $html .= " (alias for ".$artist_link.")";
+				//if ($artist['type'] == 'alias')
+				//	$html .= " (alias for ".$artist_link.")";
 
-                $html .= "</td>".
-                    "<td>".$typeTextArray[$artist['type']]."</td>".
-                    "<td>".$user_link."</td>".
-                    "<td>".$artist['posts']."</td>";
+				$html .= "</td>".
+					"<td>".$typeTextArray[$artist['type']]."</td>".
+					"<td>".$user_link."</td>".
+					"<td>".$artist['posts']."</td>";
 
-                if(!$user->is_anonymous()) $html .= "<td>".$edit_link."</td>";
-                if($user->is_admin()) $html .= "<td>".$del_link."</td>";
+				if(!$user->is_anonymous()) $html .= "<td>".$edit_link."</td>";
+				if($user->is_admin()) $html .= "<td>".$del_link."</td>";
 
-                $html .= "</tr>";
-            }
+				$html .= "</tr>";
+			}
 
-            $html .= "</tbody></table>";
+			$html .= "</tbody></table>";
 
-            $page->set_title("Artists");
-            $page->set_heading("Artists");
-            $page->add_block(new Block("Artists", $html, "main", 10));
+			$page->set_title("Artists");
+			$page->set_heading("Artists");
+			$page->add_block(new Block("Artists", $html, "main", 10));
 
-            $this->display_paginator($page, "artist/list", null, $pageNumber, $totalPages);
+			$this->display_paginator($page, "artist/list", null, $pageNumber, $totalPages);
 	}
 
-        public function show_new_alias_composer($artistID)
-        {
-            global $user;
+		public function show_new_alias_composer($artistID)
+		{
+			global $user;
 
-            $html =
-            '<form method="POST" action='.make_link("artist/alias/add").'>
+			$html =
+			'<form method="POST" action='.make_link("artist/alias/add").'>
 				'.$user->get_auth_html().'
 				  <table>
 					<tr><td>Alias:</td><td><input type="text" name="aliases" />
@@ -240,266 +240,265 @@ class ArtistsTheme extends Themelet {
 					<tr><td colspan="2"><input type="submit" value="Submit" /></td></tr>
 				</table>
 			</form>		
-            ';
+			';
 
-            global $page;
-            $page->add_block(new Block("Artist Aliases", $html, "main", 20));
-        }
-        public function show_new_member_composer($artistID)
-        {
-            global $user;
+			global $page;
+			$page->add_block(new Block("Artist Aliases", $html, "main", 20));
+		}
+		public function show_new_member_composer($artistID)
+		{
+			global $user;
 
-            $html =
-            '   <form method="POST" action='.make_link("artist/member/add").'>					
+			$html =
+			'   <form method="POST" action='.make_link("artist/member/add").'>					
 				'.$user->get_auth_html().'
 					<table>
 						<tr><td>Members:</td><td><input type="text" name="members" />
 											   <input type="hidden" name="artistID" value='.$artistID.' /></td></tr>
 						<tr><td colspan="2"><input type="submit" value="Submit" /></td></tr>
 					</table>
-                </form>
-            ';
+				</form>
+			';
 
-            global $page;
-            $page->add_block(new Block("Artist members", $html, "main", 30));
-        }
+			global $page;
+			$page->add_block(new Block("Artist members", $html, "main", 30));
+		}
 
-        public function show_new_url_composer($artistID)
-        {
-            global $user;
+		public function show_new_url_composer($artistID)
+		{
+			global $user;
 
-            $html =
-            '   <form method="POST" action='.make_link("artist/url/add").'>					
+			$html =
+			'   <form method="POST" action='.make_link("artist/url/add").'>					
 				'.$user->get_auth_html().'
 					<table>
 						<tr><td>URL:</td><td><textarea name="urls"></textarea>
 											   <input type="hidden" name="artistID" value='.$artistID.' /></td></tr>
 						<tr><td colspan="2"><input type="submit" value="Submit" /></td></tr>
 					</table>
-                </form>
-            ';
+				</form>
+			';
 
-            global $page;
-            $page->add_block(new Block("Artist URLs", $html, "main", 40));
-        }
+			global $page;
+			$page->add_block(new Block("Artist URLs", $html, "main", 40));
+		}
 
-        public function show_alias_editor($alias)
-        {
-            global $user;
+		public function show_alias_editor($alias)
+		{
+			global $user;
 
-            $html =
-            '
-                <form method="POST" action="'.make_link("artist/alias/edited/".$alias['id']).'">
+			$html =
+			'
+				<form method="POST" action="'.make_link("artist/alias/edited/".$alias['id']).'">
 					'.$user->get_auth_html().'
-                    <label for="alias">Alias:</label>
-                    <input type="text" name="alias" value="'.$alias['alias'].'" />
-                    <input type="hidden" name="aliasID" value="'.$alias['id'].'" />
-                    <input type="submit" value="Submit" />
-                </form>
-            ';
+					<label for="alias">Alias:</label>
+					<input type="text" name="alias" value="'.$alias['alias'].'" />
+					<input type="hidden" name="aliasID" value="'.$alias['id'].'" />
+					<input type="submit" value="Submit" />
+				</form>
+			';
 
-            global $page;
-            $page->add_block(new Block("Edit Alias", $html, "main", 10));
-        }
+			global $page;
+			$page->add_block(new Block("Edit Alias", $html, "main", 10));
+		}
 
-        public function show_url_editor($url)
-        {
-            global $user;
+		public function show_url_editor($url)
+		{
+			global $user;
 
-            $html =
-            '
-                <form method="POST" action="'.make_link("artist/url/edited/".$url['id']).'">
+			$html =
+			'
+				<form method="POST" action="'.make_link("artist/url/edited/".$url['id']).'">
 					'.$user->get_auth_html().'
-                    <label for="url">URL:</label>
-                    <input type="text" name="url" value="'.$url['url'].'" />
-                    <input type="hidden" name="urlID" value="'.$url['id'].'" />
-                    <input type="submit" value="Submit" />
-                </form>
-            ';
+					<label for="url">URL:</label>
+					<input type="text" name="url" value="'.$url['url'].'" />
+					<input type="hidden" name="urlID" value="'.$url['id'].'" />
+					<input type="submit" value="Submit" />
+				</form>
+			';
 
-            global $page;
-            $page->add_block(new Block("Edit URL", $html, "main", 10));
-        }
+			global $page;
+			$page->add_block(new Block("Edit URL", $html, "main", 10));
+		}
 
-        public function show_member_editor($member)
-        {
-            global $user;
+		public function show_member_editor($member)
+		{
+			global $user;
 
-            $html =
-            '
-                <form method="POST" action="'.make_link("artist/member/edited/".$member['id']).'">
+			$html =
+			'
+				<form method="POST" action="'.make_link("artist/member/edited/".$member['id']).'">
 					'.$user->get_auth_html().'
-                    <label for="member">Member name:</label>
-                    <input type="text" name="name" value="'.$member['name'].'" />
-                    <input type="hidden" name="memberID" value="'.$member['id'].'" />
-                    <input type="submit" value="Submit" />
-                </form>
-            ';
+					<label for="member">Member name:</label>
+					<input type="text" name="name" value="'.$member['name'].'" />
+					<input type="hidden" name="memberID" value="'.$member['id'].'" />
+					<input type="submit" value="Submit" />
+				</form>
+			';
 
-            global $page;
-            $page->add_block(new Block("Edit Member", $html, "main", 10));
-        }
+			global $page;
+			$page->add_block(new Block("Edit Member", $html, "main", 10));
+		}
 
 	public function show_artist($artist, $aliases, $members, $urls, $images, $userIsLogged, $userIsAdmin)
-        {
-            global $page;
+		{
+			global $page;
 
-            $artist_link = "<a href='".make_link("post/list/".$artist['name']."/1")."'>".str_replace("_", " ", $artist['name'])."</a>";
+			$artist_link = "<a href='".make_link("post/list/".$artist['name']."/1")."'>".str_replace("_", " ", $artist['name'])."</a>";
 
-            $html = "<table id='poolsList' class='zebra'>
-                    <thead>
-                        <tr>
-                            <th></th>
-                            <th></th>";
-            
-            if ($userIsLogged)
-                $html .= "<th></th>";
-
-            if ($userIsAdmin)
-                $html .= "<th></th>";
-
-            $html .= "  <tr>
-                    </thead>
-
-                    <tr>
-                        <td class='left'>Name:</td>
-                        <td class='left'>".$artist_link."</td>";
-            if ($userIsLogged) $html .= "<td></td>";
-            if ($userIsAdmin) $html .= "<td></td>";
-            $html .= "</tr>";
-
-            if (count($aliases) > 0)
-            {
-                $aliasViewLink = str_replace("_", " ", $aliases[0]['alias_name']); // no link anymore
-                $aliasEditLink = "<a href='".make_link("artist/alias/edit/".$aliases[0]['alias_id'])."'>Edit</a>";
-                $aliasDeleteLink = "<a href='".make_link("artist/alias/delete/".$aliases[0]['alias_id'])."'>Delete</a>";
-                
-                $html .= "<tr>
-                              <td class='left'>Aliases:</td>
-                              <td class='left'>".$aliasViewLink."</td>";
-                
-                if ($userIsLogged)
-                    $html .= "<td class='left'>".$aliasEditLink."</td>";
-
-                if ($userIsAdmin)
-                    $html .= "<td class='left'>".$aliasDeleteLink."</td>";
-                    
-                $html .= "</tr>";
-
-                if (count($aliases) > 1)
-                {
-                    for ($i = 1; $i < count($aliases); $i++)
-                    {
-                        $aliasViewLink = str_replace("_", " ", $aliases[$i]['alias_name']); // no link anymore
-                        $aliasEditLink = "<a href='".make_link("artist/alias/edit/".$aliases[$i]['alias_id'])."'>Edit</a>";
-                        $aliasDeleteLink = "<a href='".make_link("artist/alias/delete/".$aliases[$i]['alias_id'])."'>Delete</a>";
-
-                        $html .= "<tr>
-                                      <td class='left'>&nbsp;</td>
-                                      <td class='left'>".$aliasViewLink."</td>";
-                        if ($userIsLogged)
-                            $html .= "<td class='left'>".$aliasEditLink."</td>";
-                        if ($userIsAdmin)
-                            $html .= "<td class='left'>".$aliasDeleteLink."</td>";
-                            
-                        $html .= "</tr>";
-                    }
-                }
-            }
-
-            if (count($members) > 0)
-            {
-                $memberViewLink = str_replace("_", " ", $members[0]['name']); // no link anymore
-                $memberEditLink = "<a href='".make_link("artist/member/edit/".$members[0]['id'])."'>Edit</a>";
-                $memberDeleteLink = "<a href='".make_link("artist/member/delete/".$members[0]['id'])."'>Delete</a>";
-
-                $html .= "<tr>
-                            <td class='left'>Members:</td>
-                            <td class='left'>".$memberViewLink."</td>";
-                if ($userIsLogged)
-                    $html .= "<td class='left'>".$memberEditLink."</td>";
-                if ($userIsAdmin)
-                    $html .= "<td class='left'>".$memberDeleteLink."</td>";
-
-                $html .= "</tr>";
-
-                if (count($members) > 1)
-                {
-                    for ($i = 1; $i < count($members); $i++)
-                    {
-                        $memberViewLink = str_replace("_", " ", $members[$i]['name']); // no link anymore
-                        $memberEditLink = "<a href='".make_link("artist/member/edit/".$members[$i]['id'])."'>Edit</a>";
-                        $memberDeleteLink = "<a href='".make_link("artist/member/delete/".$members[$i]['id'])."'>Delete</a>";
-
-                        $html .= "<tr>
-                                <td class='left'>&nbsp;</td>
-                                <td class='left'>".$memberViewLink."</td>";
-                        if ($userIsLogged)
-                            $html .= "<td class='left'>".$memberEditLink."</td>";
-                        if ($userIsAdmin)
-                            $html .= "<td class='left'>".$memberDeleteLink."</td>";
-
-                        $html .= "</tr>";
-                    }
-                }
-            }
-
-            if (count($urls) > 0)
-            {
-                $urlViewLink = "<a href='".str_replace("_", " ", $urls[0]['url'])."' target='_blank'>".str_replace("_", " ", $urls[0]['url'])."</a>";
-                $urlEditLink = "<a href='".make_link("artist/url/edit/".$urls[0]['id'])."'>Edit</a>";
-                $urlDeleteLink = "<a href='".make_link("artist/url/delete/".$urls[0]['id'])."'>Delete</a>";
-
-                $html .= "<tr>
-                            <td class='left'>URLs:</td>
-                            <td class='left'>".$urlViewLink."</td>";
-                
-                if ($userIsLogged)
-                    $html .= "<td class='left'>".$urlEditLink."</td>";
-                    
-                if ($userIsAdmin)
-                    $html .= "<td class='left'>".$urlDeleteLink."</td>";
-                    
-                $html .= "</tr>";
-
-                if (count($urls) > 1)
-                {
-                    for ($i = 1; $i < count($urls); $i++)
-                    {
-                        $urlViewLink = "<a href='".str_replace("_", " ", $urls[$i]['url'])."' target='_blank'>".str_replace("_", " ", $urls[$i]['url'])."</a>";
-                        $urlEditLink = "<a href='".make_link("artist/url/edit/".$urls[$i]['id'])."'>Edit</a>";
-                        $urlDeleteLink = "<a href='".make_link("artist/url/delete/".$urls[$i]['id'])."'>Delete</a>";
-
-                        $html .= "<tr>
-                                <td class='left'>&nbsp;</td>
-                                <td class='left'>".$urlViewLink."</td>";
-                        if ($userIsLogged)
-                            $html .= "<td class='left'>".$urlEditLink."</td>";
-                            
-                        if ($userIsAdmin)
-                            $html .= "<td class='left'>".$urlDeleteLink."</td>";
-
-                        $html .= "</tr>";
-                    }
-                }
-            }
-
-            $html .=
-                    "<tr>
-                        <td class='left'>Notes:</td>
-                        <td class='left'>".$artist["notes"]."</td>";
-            if ($userIsLogged) $html .= "<td></td>";
-            if ($userIsAdmin) $html .= "<td></td>";
-            //TODO how will notes be edited? On edit artist? (should there be an editartist?) or on a editnotes?
-            //same question for deletion
-            $html .= "</tr>
-            </table>";
-
-            $page->set_title("Artist");
-            $page->set_heading("Artist");
-            $page->add_block(new Block("Artist", $html, "main", 10));
-			
+			$html = "<table id='poolsList' class='zebra'>
+					<thead>
+						<tr>
+							<th></th>
+							<th></th>";
 			
+			if ($userIsLogged)
+				$html .= "<th></th>";
+
+			if ($userIsAdmin)
+				$html .= "<th></th>";
+
+			$html .= "  <tr>
+					</thead>
+
+					<tr>
+						<td class='left'>Name:</td>
+						<td class='left'>".$artist_link."</td>";
+			if ($userIsLogged) $html .= "<td></td>";
+			if ($userIsAdmin) $html .= "<td></td>";
+			$html .= "</tr>";
+
+			if (count($aliases) > 0)
+			{
+				$aliasViewLink = str_replace("_", " ", $aliases[0]['alias_name']); // no link anymore
+				$aliasEditLink = "<a href='".make_link("artist/alias/edit/".$aliases[0]['alias_id'])."'>Edit</a>";
+				$aliasDeleteLink = "<a href='".make_link("artist/alias/delete/".$aliases[0]['alias_id'])."'>Delete</a>";
+				
+				$html .= "<tr>
+							  <td class='left'>Aliases:</td>
+							  <td class='left'>".$aliasViewLink."</td>";
+				
+				if ($userIsLogged)
+					$html .= "<td class='left'>".$aliasEditLink."</td>";
+
+				if ($userIsAdmin)
+					$html .= "<td class='left'>".$aliasDeleteLink."</td>";
+					
+				$html .= "</tr>";
+
+				if (count($aliases) > 1)
+				{
+					for ($i = 1; $i < count($aliases); $i++)
+					{
+						$aliasViewLink = str_replace("_", " ", $aliases[$i]['alias_name']); // no link anymore
+						$aliasEditLink = "<a href='".make_link("artist/alias/edit/".$aliases[$i]['alias_id'])."'>Edit</a>";
+						$aliasDeleteLink = "<a href='".make_link("artist/alias/delete/".$aliases[$i]['alias_id'])."'>Delete</a>";
+
+						$html .= "<tr>
+									  <td class='left'>&nbsp;</td>
+									  <td class='left'>".$aliasViewLink."</td>";
+						if ($userIsLogged)
+							$html .= "<td class='left'>".$aliasEditLink."</td>";
+						if ($userIsAdmin)
+							$html .= "<td class='left'>".$aliasDeleteLink."</td>";
+							
+						$html .= "</tr>";
+					}
+				}
+			}
+
+			if (count($members) > 0)
+			{
+				$memberViewLink = str_replace("_", " ", $members[0]['name']); // no link anymore
+				$memberEditLink = "<a href='".make_link("artist/member/edit/".$members[0]['id'])."'>Edit</a>";
+				$memberDeleteLink = "<a href='".make_link("artist/member/delete/".$members[0]['id'])."'>Delete</a>";
+
+				$html .= "<tr>
+							<td class='left'>Members:</td>
+							<td class='left'>".$memberViewLink."</td>";
+				if ($userIsLogged)
+					$html .= "<td class='left'>".$memberEditLink."</td>";
+				if ($userIsAdmin)
+					$html .= "<td class='left'>".$memberDeleteLink."</td>";
+
+				$html .= "</tr>";
+
+				if (count($members) > 1)
+				{
+					for ($i = 1; $i < count($members); $i++)
+					{
+						$memberViewLink = str_replace("_", " ", $members[$i]['name']); // no link anymore
+						$memberEditLink = "<a href='".make_link("artist/member/edit/".$members[$i]['id'])."'>Edit</a>";
+						$memberDeleteLink = "<a href='".make_link("artist/member/delete/".$members[$i]['id'])."'>Delete</a>";
+
+						$html .= "<tr>
+								<td class='left'>&nbsp;</td>
+								<td class='left'>".$memberViewLink."</td>";
+						if ($userIsLogged)
+							$html .= "<td class='left'>".$memberEditLink."</td>";
+						if ($userIsAdmin)
+							$html .= "<td class='left'>".$memberDeleteLink."</td>";
+
+						$html .= "</tr>";
+					}
+				}
+			}
+
+			if (count($urls) > 0)
+			{
+				$urlViewLink = "<a href='".str_replace("_", " ", $urls[0]['url'])."' target='_blank'>".str_replace("_", " ", $urls[0]['url'])."</a>";
+				$urlEditLink = "<a href='".make_link("artist/url/edit/".$urls[0]['id'])."'>Edit</a>";
+				$urlDeleteLink = "<a href='".make_link("artist/url/delete/".$urls[0]['id'])."'>Delete</a>";
+
+				$html .= "<tr>
+							<td class='left'>URLs:</td>
+							<td class='left'>".$urlViewLink."</td>";
+				
+				if ($userIsLogged)
+					$html .= "<td class='left'>".$urlEditLink."</td>";
+					
+				if ($userIsAdmin)
+					$html .= "<td class='left'>".$urlDeleteLink."</td>";
+					
+				$html .= "</tr>";
+
+				if (count($urls) > 1)
+				{
+					for ($i = 1; $i < count($urls); $i++)
+					{
+						$urlViewLink = "<a href='".str_replace("_", " ", $urls[$i]['url'])."' target='_blank'>".str_replace("_", " ", $urls[$i]['url'])."</a>";
+						$urlEditLink = "<a href='".make_link("artist/url/edit/".$urls[$i]['id'])."'>Edit</a>";
+						$urlDeleteLink = "<a href='".make_link("artist/url/delete/".$urls[$i]['id'])."'>Delete</a>";
+
+						$html .= "<tr>
+								<td class='left'>&nbsp;</td>
+								<td class='left'>".$urlViewLink."</td>";
+						if ($userIsLogged)
+							$html .= "<td class='left'>".$urlEditLink."</td>";
+							
+						if ($userIsAdmin)
+							$html .= "<td class='left'>".$urlDeleteLink."</td>";
+
+						$html .= "</tr>";
+					}
+				}
+			}
+
+			$html .=
+					"<tr>
+						<td class='left'>Notes:</td>
+						<td class='left'>".$artist["notes"]."</td>";
+			if ($userIsLogged) $html .= "<td></td>";
+			if ($userIsAdmin) $html .= "<td></td>";
+			//TODO how will notes be edited? On edit artist? (should there be an editartist?) or on a editnotes?
+			//same question for deletion
+			$html .= "</tr>
+			</table>";
+
+			$page->set_title("Artist");
+			$page->set_heading("Artist");
+			$page->add_block(new Block("Artist", $html, "main", 10));
+
 			//we show the images for the artist
 			$artist_images = "";
 			foreach($images as $image) {
diff --git a/ext/bulk_add/main.php b/ext/bulk_add/main.php
index 408db0fc..cf58e4a3 100644
--- a/ext/bulk_add/main.php
+++ b/ext/bulk_add/main.php
@@ -30,7 +30,7 @@ class BulkAdd extends Extension {
 	public function onCommand(CommandEvent $event) {
 		if($event->cmd == "help") {
 			print "  bulk-add [directory]\n";
-			print "    Import this directory\n\n";
+			print "	Import this directory\n\n";
 		}
 		if($event->cmd == "bulk-add") {
 			if(count($event->args) == 1) {
@@ -53,7 +53,7 @@ class BulkAdd extends Extension {
 		if(!array_key_exists('extension', $pathinfo)) {
 			throw new UploadException("File has no extension");
 		}
-        $metadata = array();
+		$metadata = array();
 		$metadata['filename'] = $pathinfo['basename'];
 		$metadata['extension'] = $pathinfo['extension'];
 		$metadata['tags'] = $tags;
diff --git a/ext/bulk_add_csv/main.php b/ext/bulk_add_csv/main.php
index cd9ead8b..4ff15773 100644
--- a/ext/bulk_add_csv/main.php
+++ b/ext/bulk_add_csv/main.php
@@ -33,7 +33,7 @@ class BulkAddCSV extends Extension {
 	public function onCommand(CommandEvent $event) {
 		if($event->cmd == "help") {
 			print "  bulk-add-csv [/path/to.csv]\n";
-			print "    Import this .csv file (refer to documentation)\n\n";
+			print "	Import this .csv file (refer to documentation)\n\n";
 		}
 		if($event->cmd == "bulk-add-csv") {
 			global $user;
@@ -62,7 +62,7 @@ class BulkAddCSV extends Extension {
 		if(!array_key_exists('extension', $pathinfo)) {
 			throw new UploadException("File has no extension");
 		}
-        $metadata = array();
+		$metadata = array();
 		$metadata['filename'] = $pathinfo['basename'];
 		$metadata['extension'] = $pathinfo['extension'];
 		$metadata['tags'] = $tags;
diff --git a/ext/cron_uploader/main.php b/ext/cron_uploader/main.php
index 56d23f40..24c62c55 100644
--- a/ext/cron_uploader/main.php
+++ b/ext/cron_uploader/main.php
@@ -305,7 +305,7 @@ class CronUploader extends Extension {
 		if (! array_key_exists ( 'extension', $pathinfo )) {
 			throw new UploadException ( "File has no extension" );
 		}
-        $metadata = array();
+		$metadata = array();
 		$metadata ['filename'] = $pathinfo ['basename'];
 		$metadata ['extension'] = $pathinfo ['extension'];
 		$metadata ['tags'] = ""; // = $tags; doesn't work when not logged in here
@@ -370,7 +370,7 @@ class CronUploader extends Extension {
 	 * Adds a message to the info being published at the end
 	 * @param $text string
 	 * @param $addon int Enter a value to modify an existing value (enter value number)
-     * @return int
+	 * @return int
 	 */
 	private function add_upload_info($text, $addon = 0) {
 		$info = $this->upload_info;
@@ -415,4 +415,4 @@ class CronUploader extends Extension {
 		file_put_contents ($log_path, $content);
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index 3d92a092..fdd59c4e 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -21,7 +21,7 @@ function __extman_extcmp(ExtensionInfo $a, ExtensionInfo $b) {
 class ExtensionInfo {
 	var $ext_name, $name, $link, $author, $email;
 	var $description, $documentation, $version, $visibility;
-    var $enabled;
+	var $enabled;
 
 	function __construct($main) {
 		$matches = array();
@@ -132,7 +132,7 @@ class ExtManager extends Extension {
 	public function onCommand(CommandEvent $event) {
 		if($event->cmd == "help") {
 			print "  disable-all-ext\n";
-			print "    disable all extensions\n\n";
+			print "	disable all extensions\n\n";
 		}
 		if($event->cmd == "disable-all-ext") {
 			$this->write_config(array());
@@ -168,7 +168,7 @@ class ExtManager extends Extension {
 
 	private function set_things($settings) {
 		$core = explode(",", CORE_EXTS);
-        $extras = array();
+		$extras = array();
 
 		foreach(glob("ext/*/main.php") as $main) {
 			$matches = array();
diff --git a/ext/handle_archive/main.php b/ext/handle_archive/main.php
index a6787ac6..f4dfe3dc 100644
--- a/ext/handle_archive/main.php
+++ b/ext/handle_archive/main.php
@@ -54,7 +54,7 @@ class ArchiveFileHandler extends Extension {
 			if(!array_key_exists('extension', $pathinfo)) {
 				throw new UploadException("File has no extension");
 			}
-            $metadata = array();
+			$metadata = array();
 			$metadata['filename'] = $pathinfo['basename'];
 			$metadata['extension'] = $pathinfo['extension'];
 			$metadata['tags'] = $tags;
diff --git a/ext/handle_flash/main.php b/ext/handle_flash/main.php
index d7e42f9b..88becce7 100644
--- a/ext/handle_flash/main.php
+++ b/ext/handle_flash/main.php
@@ -20,13 +20,13 @@ class FlashFileHandler extends DataHandlerExtension {
 		$image = new Image();
 
 		$image->filesize  = $metadata['size'];
-		$image->hash      = $metadata['hash'];
+		$image->hash	  = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
 		$image->ext       = $metadata['extension'];
 		$image->tag_array = Tag::explode($metadata['tags']);
 		$image->source    = $metadata['source'];
 
-        $info = getimagesize($filename);
+		$info = getimagesize($filename);
 		if(!$info) return null;
 
 		$image->width = $info[0];
@@ -36,14 +36,14 @@ class FlashFileHandler extends DataHandlerExtension {
 	}
 
 	protected function check_contents(/*string*/ $file) {
-        if (!file_exists($file)) return false;
+		if (!file_exists($file)) return false;
 
-        $fp = fopen($file, "r");
-        $head = fread($fp, 3);
-        fclose($fp);
-        if (!in_array($head, array("CWS", "FWS"))) return false;
+		$fp = fopen($file, "r");
+		$head = fread($fp, 3);
+		fclose($fp);
+		if (!in_array($head, array("CWS", "FWS"))) return false;
 
-        return true;
-    }
+		return true;
+	}
 }
 ?>
diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index da8e5e31..0ee4ca69 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -23,11 +23,11 @@ class PixelFileHandler extends DataHandlerExtension {
 		$image->height = $info[1];
 
 		$image->filesize  = $metadata['size'];
-		$image->hash      = $metadata['hash'];
+		$image->hash	  = $metadata['hash'];
 		$image->filename  = (($pos = strpos($metadata['filename'],'?')) !== false) ? substr($metadata['filename'],0,$pos) : $metadata['filename'];
-		$image->ext       = (($pos = strpos($metadata['extension'],'?')) !== false) ? substr($metadata['extension'],0,$pos) : $metadata['extension'];
+		$image->ext	   = (($pos = strpos($metadata['extension'],'?')) !== false) ? substr($metadata['extension'],0,$pos) : $metadata['extension'];
 		$image->tag_array = Tag::explode($metadata['tags']);
-		$image->source    = $metadata['source'];
+		$image->source	= $metadata['source'];
 
 		return $image;
 	}
@@ -50,7 +50,7 @@ class PixelFileHandler extends DataHandlerExtension {
 	}
 
 	protected function create_thumb_force(/*string*/ $hash) {
-        global $config;
+		global $config;
 
 		$inname  = warehouse_path("images", $hash);
 		$outname = warehouse_path("thumbs", $hash);
diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index b4e87dde..3e584ce3 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -31,9 +31,9 @@ else {
 			<source src='" . make_link("/image/" . $image->id) . "' type='video/webm' />
 			</video>";
 		}
-        else {
-            $html = "Video type '$ext' not recognised";
-        }
+		else {
+			$html = "Video type '$ext' not recognised";
+		}
 		$page->add_block(new Block("Video", $html, "main", 10));
 	}
 }
diff --git a/ext/image/main.php b/ext/image/main.php
index 51de36b0..32d1bf97 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -94,8 +94,8 @@ class ThumbnailGenerationEvent extends Event {
 	 * Request a thumbnail be made for an image object
 	 *
 	 * @param $hash	string The unique hash of the image
-     * @param $type	string The type of the image
-     * @param $force boolean Regenerate the thumbnail even if one already exists
+	 * @param $type	string The type of the image
+	 * @param $force boolean Regenerate the thumbnail even if one already exists
 	 */
 	public function __construct($hash, $type, $force=false) {
 		$this->hash = $hash;
diff --git a/ext/index/theme.php b/ext/index/theme.php
index 99a0e839..7c04910b 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class IndexTheme extends Themelet {
-    var $page_number, $total_pages, $search_terms;
+	var $page_number, $total_pages, $search_terms;
 
 	public function set_page($page_number, $total_pages, $search_terms) {
 		$this->page_number = $page_number;
diff --git a/ext/log_net/main.php b/ext/log_net/main.php
index 918a1b8e..f82d01d3 100644
--- a/ext/log_net/main.php
+++ b/ext/log_net/main.php
@@ -42,7 +42,7 @@ class LogNet extends Extension {
 			fwrite($fp, "$data\n");
 			fclose($fp);
 		} catch (Exception $e) {
-            /* logging errors shouldn't break everything */
+			/* logging errors shouldn't break everything */
 		}
 	}
 }
diff --git a/ext/notes/theme.php b/ext/notes/theme.php
index 38bfcbb3..99359b92 100644
--- a/ext/notes/theme.php
+++ b/ext/notes/theme.php
@@ -1,6 +1,6 @@
 <?php
 class NotesTheme extends Themelet {
-    public function note_button($image_id) {
+	public function note_button($image_id) {
 		return '		
 			<!-- <a href="#" id="addnotelink" >Add a note</a> -->
 			<form action="" method="">
@@ -39,32 +39,32 @@ class NotesTheme extends Themelet {
 	
 		$page->set_title(html_escape("Search Note"));
 		$page->set_heading(html_escape("Search Note"));
-        $page->add_block(new Block("Search Note", $html, "main", 10));
+		$page->add_block(new Block("Search Note", $html, "main", 10));
 	}
 		
 	// check action POST on form
 	public function display_note_system(Page $page, $image_id, $recovered_notes, $adminOptions)
 	{
 		$to_json = array();
-        foreach($recovered_notes as $note)
-        {
-            $parsedNote = $note["note"];
-            $parsedNote = str_replace("\n", "\\n", $parsedNote);
-            $parsedNote = str_replace("\r", "\\r", $parsedNote);
+		foreach($recovered_notes as $note)
+		{
+			$parsedNote = $note["note"];
+			$parsedNote = str_replace("\n", "\\n", $parsedNote);
+			$parsedNote = str_replace("\r", "\\r", $parsedNote);
 
-            $to_json[] = array(
+			$to_json[] = array(
 				'x1' => $note["x1"],
-                'y1' => $note["y1"],
-                'height' => $note["height"],
-                'width' => $note["width"],
-                'note' => $parsedNote,
-                'note_id' => $note["id"],
+				'y1' => $note["y1"],
+				'height' => $note["height"],
+				'width' => $note["width"],
+				'note' => $parsedNote,
+				'note_id' => $note["id"],
 			);
-        }
+		}
 
 		$html = "<script type='text/javascript'>";
 		$html .= "notes = " . json_encode($to_json);
-        $html .= "</script>
+		$html .= "</script>
 	
 	<div id='noteform'>
 		".make_form(make_link("note/add_note"))."
@@ -88,41 +88,41 @@ class NotesTheme extends Themelet {
 			
 		</form>
 	</div>
-        <div id='noteEditForm'>
+		<div id='noteEditForm'>
 			".make_form(make_link("note/edit_note"))."
-                <input type='hidden' name='image_id' value='".$image_id."' />
-                <input type='hidden' name='note_id' id='EditNoteID' value='' />
-                <input name='note_x1' type='hidden' value='' id='EditNoteX1' />
-                <input name='note_y1' type='hidden' value='' id='EditNoteY1' />
-                <input name='note_height' type='hidden' value='' id='EditNoteHeight' />
-                <input name='note_width' type='hidden' value='' id='EditNoteWidth' />
-                <table>
-                    <tr>
-                        <td colspan='2'>
-                            <textarea name='note_text' id='EditNoteNote' ></textarea>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><input type='submit' value='Save Note' /></td>
-                        <td><input type='button' value='Cancel' id='EditCancelNote' /></td>
-                    </tr>
-                </table>
-            </form>";
+				<input type='hidden' name='image_id' value='".$image_id."' />
+				<input type='hidden' name='note_id' id='EditNoteID' value='' />
+				<input name='note_x1' type='hidden' value='' id='EditNoteX1' />
+				<input name='note_y1' type='hidden' value='' id='EditNoteY1' />
+				<input name='note_height' type='hidden' value='' id='EditNoteHeight' />
+				<input name='note_width' type='hidden' value='' id='EditNoteWidth' />
+				<table>
+					<tr>
+						<td colspan='2'>
+							<textarea name='note_text' id='EditNoteNote' ></textarea>
+						</td>
+					</tr>
+					<tr>
+						<td><input type='submit' value='Save Note' /></td>
+						<td><input type='button' value='Cancel' id='EditCancelNote' /></td>
+					</tr>
+				</table>
+			</form>";
 
-        if($adminOptions)
-            $html .= "
+		if($adminOptions)
+			$html .= "
 				".make_form(make_link("note/delete_note"))."
-                <input type='hidden' name='image_id' value='".$image_id."' />
-                <input type='hidden' name='note_id' value='' id='DeleteNoteNoteID' />
-                <table>
-                    <tr>
-                        <td><input type='submit' value='Delete note' /></td>
-                    </tr>
-                </table>
-            </form>
+				<input type='hidden' name='image_id' value='".$image_id."' />
+				<input type='hidden' name='note_id' value='' id='DeleteNoteNoteID' />
+				<table>
+					<tr>
+						<td><input type='submit' value='Delete note' /></td>
+					</tr>
+				</table>
+			</form>
 ";
 
-        $html .= "</div>";
+		$html .= "</div>";
 
 		$page->add_block(new Block(null, $html, "main", 1));
 	}
@@ -170,64 +170,64 @@ class NotesTheme extends Themelet {
 		$page->add_block(new Block("Note Requests", $pool_images, "main", 20));
 	}
 
-    private function get_history($histories) {
-        global $user;
+	private function get_history($histories) {
+		global $user;
 
-        $html = "<table id='poolsList' class='zebra'>".
-            "<thead><tr>".
-            "<th>Image</th>".
-            "<th>Note</th>".
-            "<th>Body</th>".
-            "<th>Updater</th>".
-            "<th>Date</th>";
+		$html = "<table id='poolsList' class='zebra'>".
+			"<thead><tr>".
+			"<th>Image</th>".
+			"<th>Note</th>".
+			"<th>Body</th>".
+			"<th>Updater</th>".
+			"<th>Date</th>";
 
-        if(!$user->is_anonymous()){
-            $html .= "<th>Action</th>";
-        }
+		if(!$user->is_anonymous()){
+			$html .= "<th>Action</th>";
+		}
 
-        $html .= "</tr></thead>".
-            "<tbody>";
+		$html .= "</tr></thead>".
+			"<tbody>";
 
-        foreach($histories as $history) {
-            $image_link = "<a href='".make_link("post/view/".$history['image_id'])."'>".$history['image_id']."</a>";
-            $history_link = "<a href='".make_link("note/history/".$history['note_id'])."'>".$history['note_id'].".".$history['review_id']."</a>";
-            $user_link = "<a href='".make_link("user/".$history['user_name'])."'>".$history['user_name']."</a>";
-            $revert_link = "<a href='".make_link("note/revert/".$history['note_id']."/".$history['review_id'])."'>Revert</a>";
+		foreach($histories as $history) {
+			$image_link = "<a href='".make_link("post/view/".$history['image_id'])."'>".$history['image_id']."</a>";
+			$history_link = "<a href='".make_link("note/history/".$history['note_id'])."'>".$history['note_id'].".".$history['review_id']."</a>";
+			$user_link = "<a href='".make_link("user/".$history['user_name'])."'>".$history['user_name']."</a>";
+			$revert_link = "<a href='".make_link("note/revert/".$history['note_id']."/".$history['review_id'])."'>Revert</a>";
 
-            $html .= "<tr>".
-                "<td>".$image_link."</td>".
-                "<td>".$history_link."</td>".
-                "<td style='text-align:left;'>".$history['note']."</td>".
-                "<td>".$user_link."</td>".
-                "<td>".autodate($history['date'])."</td>";
+			$html .= "<tr>".
+				"<td>".$image_link."</td>".
+				"<td>".$history_link."</td>".
+				"<td style='text-align:left;'>".$history['note']."</td>".
+				"<td>".$user_link."</td>".
+				"<td>".autodate($history['date'])."</td>";
 
-            if(!$user->is_anonymous()){
-                $html .= "<td>".$revert_link."</td>";
-            }
+			if(!$user->is_anonymous()){
+				$html .= "<td>".$revert_link."</td>";
+			}
 
-        }
+		}
 
-        $html .= "</tr></tbody></table>";
+		$html .= "</tr></tbody></table>";
 
-        return $html;
-    }
+		return $html;
+	}
 
 	public function display_histories($histories, $pageNumber, $totalPages) {
-        global $page;
+		global $page;
 
-        $html = $this->get_history($histories);
+		$html = $this->get_history($histories);
 
-        $page->set_title("Note Updates");
-        $page->set_heading("Note Updates");
-        $page->add_block(new Block("Note Updates", $html, "main", 10));
+		$page->set_title("Note Updates");
+		$page->set_heading("Note Updates");
+		$page->add_block(new Block("Note Updates", $html, "main", 10));
 
-        $this->display_paginator($page, "note/updated", null, $pageNumber, $totalPages);
+		$this->display_paginator($page, "note/updated", null, $pageNumber, $totalPages);
 	}
 	
 	public function display_history($histories, $pageNumber, $totalPages) {
-        global $page;
+		global $page;
 
-        $html = $this->get_history($histories);
+		$html = $this->get_history($histories);
 
 		$page->set_title("Note History");
 		$page->set_heading("Note History");
@@ -235,5 +235,5 @@ class NotesTheme extends Themelet {
 		
 		$this->display_paginator($page, "note/updated", null, $pageNumber, $totalPages);
 	}
-}        
+}		
 ?>
diff --git a/ext/oekaki/main.php b/ext/oekaki/main.php
index 942e5f30..6c114537 100644
--- a/ext/oekaki/main.php
+++ b/ext/oekaki/main.php
@@ -28,7 +28,7 @@ class Oekaki extends Extension {
 							throw new UploadException("File has no extension");
 						}
 						log_info("oekaki", "Processing file [{$pathinfo['filename']}]");
-                        $metadata = array();
+						$metadata = array();
 						$metadata['filename'] = 'oekaki.png';
 						$metadata['extension'] = $pathinfo['extension'];
 						$metadata['tags'] = 'oekaki tagme';