diff --git a/web/root/members/viewprofile.ssjs b/web/root/members/viewprofile.ssjs
index 49030ce61ca4267df5807a6c7edafd3bcf5c7be6..caca3c99d191abe27166ddcae81b98a52791137e 100644
--- a/web/root/members/viewprofile.ssjs
+++ b/web/root/members/viewprofile.ssjs
@@ -39,82 +39,84 @@ if(file_exists(prefs_dir +format("%04d.html_prefs",u.number))) {
 	prefsfile=new File(prefs_dir + format("%04d.html_prefs",u.number));
 	if(prefsfile.open("r",false)) {
 				usr.icq = prefsfile.iniGetValue('Profile', 'ICQ');
-				if(usr.icq==undefined)
-					usr.icq='';
 				usr.msn = prefsfile.iniGetValue('Profile', 'MSN');
-				if(usr.msn==undefined)
-					usr.msn='';
 				usr.yahoo = prefsfile.iniGetValue('Profile', 'Yahoo');
-				if(usr.yahoo==undefined)
-					usr.yahoo='';
 				usr.aim = prefsfile.iniGetValue('Profile', 'AIM');
-				if(usr.aim==undefined)
-					usr.aim='';
 				usr.homepage = prefsfile.iniGetValue('Profile', 'Homepage');
-				if(usr.homepage==undefined)
-					usr.homepage='';
 				usr.hobbies = prefsfile.iniGetValue('Profile', 'Hobbies');
-				if(usr.hobbies==undefined)
-					usr.hobbies='';
 				usr.picture = prefsfile.iniGetValue('Profile', 'Picture');
-				if(usr.picture==undefined)
-					usr.picture='';
 				usr.avatar = prefsfile.iniGetValue('Profile', 'Avatar');
-				if(usr.avatar==undefined)
-					usr.avatar='';
 		prefsfile.close();
 	}
 }
 
+
+if(usr.icq==undefined)
+	usr.icq='Unavailable';
+if(usr.msn==undefined)
+	usr.msn='Unavailable';
+if(usr.yahoo==undefined)
+	usr.yahoo='Unavailable';
+if(usr.aim==undefined)
+	usr.aim='Unavailable';
+if(usr.homepage==undefined)
+	usr.homepage='Unavailable';
+if(usr.hobbies==undefined)
+	usr.hobbies='Unavailable';
+if(usr.picture==undefined)
+	usr.picture='Unavailable';
+if(usr.avatar==undefined)
+	usr.avatar='Unavailable';
+
 if(is_sysop) {
 	template.profile.push({html: '<h1>Edit/View Profile</h1>' });
 	template.profile.push({html: '<p>Personal Information</p>' });
 	template.profile.push({html: '<form action="/members/updateprofile.ssjs?edituser=' + u.number + '" method="post">' });
-	template.profile.push({html: '<table class="userstats" cellpadding="0" cellspacing="2">' });
+	template.profile.push({html: '<table class="userstats2" cellpadding="0" cellspacing="1">' });
 	if(system.newuser_questions & UQ_REALNAME)
-		template.profile.push({html: '<tr><td class="userstats" align="right">Real Name: </td><td class="userstats" align="left"><input type="text" name="name" size="25" maxlength="25" value="' + usr.name + '" /></td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Real Name: </td><td class="userstats" align="left"><input type="text" name="name" size="25" maxlength="25" value="' + usr.name + '" /></td></tr>' });
 	if(system.newuser_questions & UQ_ALIASES)
-		template.profile.push({html: '<tr><td class="userstats" align="right">Alias: </td><td class="userstats" align="left"><input type="text" name="alias" size="25" maxlength="25" value="' + usr.alias + '" /></td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Alias: </td><td class="userstats" align="left"><input type="text" name="alias" size="25" maxlength="25" value="' + usr.alias + '" /></td></tr>' });
 	if(system.newuser_questions & UQ_HANDLE)
-		template.profile.push({html: '<tr><td class="userstats" align="right">Chat Handle: </td><td class="userstats" align="left"><input type="text" name="handle" size="8" maxlength="8" value="' + usr.handle + '" /></td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">E-Mail Address: </td><td class="userstats" align="left"><input type="text" name="email" size="50" maxlength="60" value="' + usr.netmail + '" /></td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Chat Handle: </td><td class="userstats" align="left"><input type="text" name="handle" size="8" maxlength="8" value="' + usr.handle + '" /></td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">E-Mail Address: </td><td class="userstats" align="left"><input type="text" name="email" size="50" maxlength="60" value="' + usr.netmail + '" /></td></tr>' });
 	if(system.newuser_questions & UQ_ADDRESS)
-		template.profile.push({html: '<tr><td class="userstats" align="right">Address: </td><td class="userstats" align="left"><input type="text" name="address" size="50" maxlength="50" value="' + usr.address + '" /></td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Address: </td><td class="userstats" align="left"><input type="text" name="address" size="50" maxlength="50" value="' + usr.address + '" /></td></tr>' });
 	if(system.newuser_questions & UQ_LOCATION)
-		template.profile.push({html: '<tr><td class="userstats" align="right">City, State/Prov: </td><td class="userstats" align="left"><input type="text" name="location" size="50" maxlength="50" value="' + usr.location + '" /></td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">City, State/Prov: </td><td class="userstats" align="left"><input type="text" name="location" size="50" maxlength="50" value="' + usr.location + '" /></td></tr>' });
 	if(system.newuser_questions & UQ_ADDRESS)
-		template.profile.push({html: '<tr><td class="userstats" align="right">Zip/Postal Code: </td><td class="userstats" align="left"><input type="text" name="zipcode" size="50" maxlength="50" value="' + usr.zipcode + '" /></td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Zip/Postal Code: </td><td class="userstats" align="left"><input type="text" name="zipcode" size="50" maxlength="50" value="' + usr.zipcode + '" /></td></tr>' });
 	if(system.newuser_questions & UQ_PHONE)
-		template.profile.push({html: '<tr><td class="userstats" align="right">Phone: </td><td class="userstats" align="left"><input type="text" name="phone" size="50" maxlength="50" value="' + usr.phonee + '" /></td></tr>' });
-		template.profile.push({html: '<tr><td class="userstats" align="right">Last Connected Via: </td><td class="userstats" align="left"><input type="text" name="phone" size="50" maxlength="50" value="' + usr.connection + '" disabled="disabled" /></td></tr>' });
-		template.profile.push({html: '<tr><td class="userstats" align="right">Last Logon Date: </td><td class="userstats" align="left"><input type="text" name="phone" size="50" maxlength="50" value="' + usr.logon + '" disabled="disabled" /></td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Phone: </td><td class="userstats" align="left"><input type="text" name="phone" size="50" maxlength="50" value="' + usr.phonee + '" /></td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Last Connected Via: </td><td class="userstats" align="left"><input type="text" name="phone" size="50" maxlength="50" value="' + usr.connection + '" disabled="disabled" /></td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Last Logon Date: </td><td class="userstats" align="left"><input type="text" name="phone" size="50" maxlength="50" value="' + usr.logon + '" disabled="disabled" /></td></tr>' });
 	template.profile.push({html: '</table>' });
 	template.profile.push({html: '<h3>Web Profile</h3>'});
-	template.profile.push({html: '<p>Changes here are only visible in the Web Interface.</p>' });
-	template.profile.push({html: '<table class="userstats" cellpadding="0" cellspacing="2">' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">ICQ :</td><td class="userstats" align="left"><input type="text" name="icq" size="10" maxlength="10" value="' + usr.icq + '" /></td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">MSN :</td><td class="userstats" align="left"><input type="text" name="msn" size="50" maxlength="50" value="' + usr.msn + '" /></td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Yahoo :</td><td class="userstats" align="left"><input type="text" name="yahoo" size="50" maxlength="50" value="' + usr.yahoo + '" /></td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">AIM :</td><td class="userstats" align="left"><input type="text" name="aim" size="50" maxlength="50" value="' + usr.aim + '" /></td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Homepage :</td><td class="userstats" align="left"><input type="text" name="homepage" size="50" maxlength="50" value="' + usr.homepage + '" /></td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Hobbies :</td><td class="userstats" align="left"><input type="textarea" size="50" name="hobbies" value="' + usr.hobbies + '" /></td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Picture (Link): </td><td class="userstats" align="left"><input type="textarea" size="50" name="picture" value="' + usr.picture + '" /></td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Avatar (Link): </td><td class="userstats" align="left"><input type="textarea" size="50" name="avatar" value="' + usr.avatar + '" /></td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats">&nbsp;</td><td class="userstats"><br /><input type="submit" value="Update Profile" /></td></tr></table></form><br />' });	
+	template.profile.push({html: '<p>Changes here are only visible in the Web Interface.<br /><br /></p>' });
+	template.profile.push({html: '<table class="userstats2" cellpadding="0" cellspacing="1">' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">ICQ :</td><td class="userstats" align="left"><input type="text" name="icq" size="10" maxlength="10" value="' + usr.icq + '" /></td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">MSN :</td><td class="userstats" align="left"><input type="text" name="msn" size="50" maxlength="50" value="' + usr.msn + '" /></td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Yahoo :</td><td class="userstats" align="left"><input type="text" name="yahoo" size="50" maxlength="50" value="' + usr.yahoo + '" /></td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">AIM :</td><td class="userstats" align="left"><input type="text" name="aim" size="50" maxlength="50" value="' + usr.aim + '" /></td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Homepage :</td><td class="userstats" align="left"><input type="text" name="homepage" size="50" maxlength="50" value="' + usr.homepage + '" /></td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Hobbies :</td><td class="userstats" align="left"><input type="textarea" size="50" name="hobbies" value="' + usr.hobbies + '" /></td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Picture (Link): </td><td class="userstats" align="left"><input type="textarea" size="50" name="picture" value="' + usr.picture + '" /></td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Avatar (Link): </td><td class="userstats" align="left"><input type="textarea" size="50" name="avatar" value="' + usr.avatar + '" /></td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright">&nbsp;</td><td class="userstats"><br /><input type="submit" value="Update Profile" /></td></tr></table></form><br />' });	
 
 } else {
 
 	template.profile.push({html: '<h1>View Profile</h1>' });
-	template.profile.push({html: '<table class="userstats" cellpadding="0" cellspacing="2">' });
+	template.profile.push({html: '<table class="userstats2" cellpadding="2" cellspacing="1">' });
 	if(system.newuser_questions & UQ_REALNAME)
-		template.profile.push({html: '<tr><td class="userstats" align="right">Real Name: </td><td class="userstats" align="left">' + usr.name + '</td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Real Name: </td><td class="userstats" align="left">' + usr.name + '</td></tr>' });
 	if(system.newuser_questions & UQ_ALIASES)
-		template.profile.push({html: '<tr><td class="userstats" align="right">Alias: </td><td class="userstats" align="left">' + usr.alias + '</td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Alias: </td><td class="userstats" align="left">' + usr.alias + '</td></tr>' });
 	if(system.newuser_questions & UQ_HANDLE)
-		template.profile.push({html: '<tr><td class="userstats" align="right">Chat Handle: </td><td class="userstats" align="left">' + usr.handle + '</td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">E-Mail Address: </td><td class="userstats" align="left">' + usr.netmail + '</td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Last Connected Via: </td><td class="userstats" align="left">' + usr.connection + '</td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Last Logon Date: </td><td class="userstats" align="left">' + usr.logon + '</td></tr>' });
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Chat Handle: </td><td class="userstats" align="left">' + usr.handle + '</td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">E-Mail Address: </td><td class="userstats" align="left">' + usr.netmail + '</td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Last Connected Via: </td><td class="userstats" align="left">' + usr.connection + '</td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Last Logon Date: </td><td class="userstats" align="left">' + usr.logon + '</td></tr>' });
 
 /*  Removed for Privacy Reasons
 *  Insert into your site at your own risk of liability!
@@ -131,21 +133,28 @@ if(is_sysop) {
 	template.profile.push({html: '</table>' });
 
 	template.profile.push({html: '<h3>Web Profile</h3>'});
-	template.profile.push({html: '<table class="userstats" cellpadding="0" cellspacing="2">' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">ICQ: </td><td class="userstats" align="left">' + usr.icq + '</td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">MSN: </td><td class="userstats" align="left">' + usr.msn + '</td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Yahoo: </td><td class="userstats" align="left">' + usr.yahoo + '</td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">AIM: </td><td class="userstats" align="left">' + usr.aim + '</td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Homepage: </td><td class="userstats" align="left">' + usr.homepage + '</td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Hobbies: </td><td class="userstats" align="left">' + usr.hobbies + '</td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Picture (Link): </td><td class="userstats" align="left"><a href="' + usr.picture + '">View Picture</a></td></tr>' });
-	template.profile.push({html: '<tr><td class="userstats" align="right">Avatar (Link): </td><td class="userstats" align="left"><a href="' + usr.avatar + '">View Avatar</a></td></tr>' });
+	template.profile.push({html: '<table class="userstats2" cellpadding="2" cellspacing="1">' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">ICQ: </td><td class="userstats" align="left">' + usr.icq + '</td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">MSN: </td><td class="userstats" align="left">' + usr.msn + '</td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Yahoo: </td><td class="userstats" align="left">' + usr.yahoo + '</td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">AIM: </td><td class="userstats" align="left">' + usr.aim + '</td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Homepage: </td><td class="userstats" align="left">' + usr.homepage + '</td></tr>' });
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Hobbies: </td><td class="userstats" align="left">' + usr.hobbies + '</td></tr>' });
+	if(usr.picture=='Unavailable')
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Picture (Link): </td><td class="userstats" align="left">' + usr.picture + '</td></tr>' });
+	else
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Picture (Link): </td><td class="userstats" align="left"><a href="' + usr.picture + '">View Picture</a></td></tr>' });
+	if(usr.avatar=='Unavailable')
+		template.profile.push({html: '<tr><td class="userstatsright" align="right">Avatar (Link): </td><td class="userstats" align="left">' + usr.avatar + '</td></tr>' });
+	else
+	template.profile.push({html: '<tr><td class="userstatsright" align="right">Avatar (Link): </td><td class="userstats" align="left"><a href="' + usr.avatar + '">View Avatar</a></td></tr>' });
 	template.profile.push({html: '</table><br />' });
 }
 
 write_template("header.inc");
 load("../web/lib/topnav_html.ssjs");
 load("../web/lib/leftnav_html.ssjs");
-
+if(CurrTheme=="NewLayout")
+	write_template("rightnav.inc");
 write_template("profile.inc");
 write_template("footer.inc");