diff --git a/css/default.css b/css/default.css
index a519ee3..7b8ceef 100644
--- a/css/default.css
+++ b/css/default.css
@@ -24,7 +24,7 @@ font.feature {
 	margin-left: 1%;
 	margin-right: 1%;
 	margin-bottom: 1%;
-	margin-top: 5px;
+	margin-top: 1%;
 	padding-left: 0.5%;
 	padding-right: 0.5%;
 	padding-top: 1.5%;
@@ -131,7 +131,7 @@ div.formfield {
 	background: #e8947c;
 	color: #000000;
 	margin: 1%;
-	padding: 5px;
+	padding: 1%;
 	width: 30%;
 	float: right;
 	font-size: 80%;
@@ -192,7 +192,7 @@ table.subscribers {
 	width: 100%;
 	}
 
-tr, td {
+table.subscribers tr, td {
 	margin: 0;
 	padding: 0;
 	}
@@ -254,9 +254,9 @@ button:hover {
 	text-align: center;
 	background-color: #c0c0b0;
 	margin-top: 5px;
-	margin-left: 0%;
-	margin-right: 1%;
-	margin-bottom: 0.2%;
+	margin-left: 0px;
+	margin-right: 5px;
+	margin-bottom: 2px;
 	color: #ffffff;
 	font-size: 125%;
 	font-style: italic;
diff --git a/template/gnupg_import_form.cs b/template/gnupg_import_form.cs
new file mode 100644
index 0000000..73bb933
--- /dev/null
+++ b/template/gnupg_import_form.cs
@@ -0,0 +1,36 @@
+<fieldset class="form">
+	<legend><?cs var:html_escape(Lang.Legend.GnupgKeyImport) ?> </legend>
+	<form method="post" action="<?cs call:link("","","","","","") ?>"
+		enctype="application/x-www-form-urlencoded">
+
+		<input type="hidden" name="gnupg_subset" value="public" />
+
+		<?cs call:show_options(UI.Options.Keymanagement.Public) ?>
+
+		<td><form method="post" action="<?cs call:link("","","","","","") ?>"
+			enctype="multipart/form-data">
+		<!-- this form has to be "multipart/form-data" to make file upload work -->
+		<input type="hidden" name="list" value="<?cs var:Data.List.Name ?>" />
+
+		<ul>
+			<li><?cs var:html_escape(Lang.Misc.GnupgImportKey) ?>
+				<ul><li><input type="file" name="gnupg_key_file" size="50"
+					maxlength="250" /></li>
+				</ul>
+			</li>
+
+			<li>
+				<!-- include default form values -->
+				<?cs include:TemplateDir + '/form_common.cs' ?>
+
+				<input type="hidden" name="action" value="gnupg_import_key" />
+				<button type="submit" name="send" value="do"><?cs
+					var:html_escape(Lang.Buttons.GnupgImportKey) ?></button>
+			</li>
+		</ul>
+	
+	</form>
+
+</fieldset>
+
+
diff --git a/template/gnupg_public.cs b/template/gnupg_public.cs
index bcd2ea4..f66a7ff 100644
--- a/template/gnupg_public.cs
+++ b/template/gnupg_public.cs
@@ -6,40 +6,7 @@
 	<p><?cs var:html_escape(Lang.Introduction.GnupgPublic) ?></p>
 </div>
 
-<fieldset class="form">
-	<legend><?cs var:html_escape(Lang.Legend.GnupgKeyImport) ?> </legend>
-	<form method="post" action="<?cs call:link("","","","","","") ?>"
-		enctype="application/x-www-form-urlencoded">
-
-		<input type="hidden" name="gnupg_subset" value="public" />
-
-		<?cs call:show_options(UI.Options.Keymanagement.Public) ?>
-
-		<td><form method="post" action="<?cs call:link("","","","","","") ?>"
-			enctype="multipart/form-data">
-		<!-- this form has to be "multipart/form-data" to make file upload work -->
-		<input type="hidden" name="list" value="<?cs var:Data.List.Name ?>" />
-
-		<ul>
-			<li><?cs var:html_escape(Lang.Misc.GnupgImportKey) ?>
-				<ul><li><input type="file" name="gnupg_key_file" size="50"
-					maxlength="250" /></li>
-				</ul>
-			</li>
-
-			<li>
-				<!-- include default form values -->
-				<?cs include:TemplateDir + '/form_common.cs' ?>
-
-				<input type="hidden" name="action" value="gnupg_import_key" />
-				<button type="submit" name="send" value="do"><?cs
-					var:html_escape(Lang.Buttons.GnupgImportKey) ?></button>
-			</li>
-		</ul>
-	
-	</form>
-
-</fieldset>
+<?cs include:TemplateDir + '/gnupg_import_form.cs' ?>
 
 <fieldset class="form">
 	<legend><?cs var:html_escape(Lang.Legend.GnupgPublicKeys) ?> </legend>
diff --git a/template/gnupg_secret.cs b/template/gnupg_secret.cs
new file mode 100644
index 0000000..16b206b
--- /dev/null
+++ b/template/gnupg_secret.cs
@@ -0,0 +1,45 @@
+<div class="title">
+	<h1><?cs var:html_escape(Lang.Title.GnupgSecret) ?></h1>
+</div>
+
+<div class="introduction">
+	<p><?cs var:html_escape(Lang.Introduction.GnupgSecret) ?></p>
+</div>
+
+<?cs include:TemplateDir + '/gnupg_import_form.cs' ?>
+
+<fieldset class="form">
+	<legend><?cs var:html_escape(Lang.Legend.GnupgSecretKeys) ?> </legend>
+
+	<?cs if:subcount(Data.List.gnupg_keys.secret) > 0 ?>
+
+		<form method="post" action="<?cs call:link("","","","","","") ?>"
+			enctype="application/x-www-form-urlencoded">
+		<input type="hidden" name="gnupg_subset" value="secret" />
+
+		<table>
+			<?cs each:key = Data.List.gnupg_keys.secret
+				?><tr><td><input type="checkbox" name="gnupg_key_<?cs var:key.id ?>"
+					id="gnupg_key_<?cs var:key.id ?>" /></td>
+					<td><label for="gnupg_key_<?cs var:key.id ?>"><?cs
+						var:html_escape(key.name) ?></label></td>
+					<td><label for="gnupg_key_<?cs var:key.id ?>"><?cs
+						var:html_escape(key.email) ?></label></td>
+					<td><label for="gnupg_key_<?cs var:key.id ?>"><?cs
+						var:html_escape(key.expires) ?></label></td>
+					</tr>
+			<?cs /each ?>
+		</table>
+
+		<!-- include default form values -->
+		<?cs include:TemplateDir + '/form_common.cs' ?>
+
+		<input type="hidden" name="action" value="gnupg_do" />
+		<button type="submit" name="send" value="do"><?cs var:html_escape(Lang.Buttons.DeleteSecretKey) ?></button>
+
+	</form>
+	<?cs else ?>
+		<p><? var:html_escape(Lang.Misc.NoSecretKeys ?></p>
+	<?cs /if ?>
+
+</fieldset>