diff --git a/plugins/date/form_date.cs b/plugins/date/form_date.cs
index 383a6a5..c04f981 100644
--- a/plugins/date/form_date.cs
+++ b/plugins/date/form_date.cs
@@ -1,9 +1,11 @@
 <?cs # $Id$ ?>
 
-<h1><?cs var:html_escape(Lang.Plugins.date.Title.ConfigDate) ?></h1>
-
+<?cs call:show_plugin_title() ?>
 <?cs call:handle_messages() ?>
 
+<fieldset>
+<legend><?cs var:html_escape(Lang.Plugins.date.Title) ?></legend>
+
 <?cs call:show_help(Lang.Plugins.date.Help.ChangeDate) ?>
 
 <?cs call:print_form_header("set_date", "date") ?>
@@ -43,4 +45,5 @@
 	<button type="submit" tabindex="6"><?cs var:html_escape(Lang.Plugins.date.Button.ConfigDate) ?></button></p>
 
 </form>
+</fieldset>
 
diff --git a/plugins/date/language.hdf b/plugins/date/language.hdf
index ca743f7..610ca89 100644
--- a/plugins/date/language.hdf
+++ b/plugins/date/language.hdf
@@ -1,7 +1,7 @@
 Name	= Change date and time
 Link	= Date
 
-Title.ConfigDate	= Date and time setting
+Title = Date and time setting
 
 Button.ConfigDate	= Set date and time
 
diff --git a/plugins/language_selection/language.hdf b/plugins/language_selection/language.hdf
index 6df1fec..cc6daac 100644
--- a/plugins/language_selection/language.hdf
+++ b/plugins/language_selection/language.hdf
@@ -1,7 +1,7 @@
 Name	= Choose interface language
 Link	= Languages
 
-Title.Language	= Choose an interface language
+Title	= Choose an interface language
 
 Help.Select = Choose your preferred interface language. This setting will be kept for your browsing session.
 
diff --git a/plugins/language_selection/language_selection.cs b/plugins/language_selection/language_selection.cs
index 30449e5..b7d0c96 100644
--- a/plugins/language_selection/language_selection.cs
+++ b/plugins/language_selection/language_selection.cs
@@ -1,7 +1,6 @@
 <?cs # $Id$ ?>
 
-<h1><?cs var:html_escape(Lang.Plugins.language_selection.Title.Language) ?></h1>
-
+<?cs call:show_plugin_title() ?>
 <?cs call:handle_messages() ?>
 
 <?cs call:show_help(Lang.Plugins.language_selection.Help.Select) ?>
diff --git a/plugins/logs/language.hdf b/plugins/logs/language.hdf
index babfadc..54fb3ef 100644
--- a/plugins/logs/language.hdf
+++ b/plugins/logs/language.hdf
@@ -1,7 +1,7 @@
 Name	= Event log
 Link	= Event log
 
-Title.Log	= Event log
+Title	= Event log
 
 Text {
 	ShowAll	= Show all messages
diff --git a/plugins/logs/show_log.cs b/plugins/logs/show_log.cs
index d68c4cb..1e0aeb1 100644
--- a/plugins/logs/show_log.cs
+++ b/plugins/logs/show_log.cs
@@ -1,7 +1,6 @@
 <?cs # $Id$ ?>
 
-<h1><?cs var:html_escape(Lang.Plugins.logs.Title.Log) ?></h1>
-
+<?cs call:show_plugin_title() ?>
 <?cs call:handle_messages() ?>
 
 <?cs call:show_help(Lang.Plugins.logs.Help.EventLog) ?>
diff --git a/plugins/network/form_network.cs b/plugins/network/form_network.cs
index c77be4f..8424913 100644
--- a/plugins/network/form_network.cs
+++ b/plugins/network/form_network.cs
@@ -1,16 +1,16 @@
 <?cs # $Id$ ?>
 
-<h1><?cs var:html_escape(Lang.Plugins.network.Title.Network) ?></h1>
-
+<?cs call:show_plugin_title() ?>
 <?cs call:handle_messages() ?>
 
-<?cs call:show_help(Lang.Plugins.network.Help.Network) ?>
-
-
 <fieldset>
-<legend><?cs var:html_escape(Lang.Plugins.network.Text.IP) ?></legend>
-	<?cs call:print_form_header("change_ip", "network") ?>
-	<p>
+<legend><?cs var:html_escape(Lang.Plugins.network.Title.IP) ?></legend>
+	<?cs call:print_form_header("static", "network") ?>
+	<?cs call:show_help(Lang.Plugins.network.Help.Network) ?>
+	<table>
+		<tr><td>
+			<?cs var:html_escape(Lang.Plugins.network.Text.IP) ?>:
+		</td><td>
 		<input class="ipnum" type="text" tabindex="1" name="ip1" size="3" id="ip"
 			value="<?cs var:Data.Plugins.network.ip.oc1
 		?>" />.<input class="ipnum" type="text" tabindex="2" name="ip2" size="3"
@@ -19,17 +19,21 @@
 			value="<?cs var:Data.Plugins.network.ip.oc3
 		?>" />.<input class="ipnum" type="text" tabindex="4" name="ip4" size="3"
 			value="<?cs var:Data.Plugins.network.ip.oc4 ?>" />
-
-		<input type="hidden" tabindex="5" name="store" value="set_ip" />
-		<button type="submit"><?cs var:html_escape(Lang.Plugins.network.Button.NetworkIP) ?></button>
-	</p>
-	</form>
-</fieldset>
-
-<fieldset>
-<legend><?cs var:html_escape(Lang.Plugins.network.Text.GW) ?></legend>
-	<?cs call:print_form_header("change_gw", "network") ?>
-	<p>
+		</td></tr>
+		<tr><td>
+		<?cs var:html_escape(Lang.Plugins.network.Text.NM) ?>:
+		</td><td>
+		<input class="ipnum" type="text" tabindex="1" name="nm1" size="3" id="nm"
+			value="<?cs var:Data.Plugins.network.nm.oc1
+		?>" />.<input class="ipnum" type="text" tabindex="2" name="nm2" size="3"
+			value="<?cs var:Data.Plugins.network.nm.oc2
+		?>" />.<input class="ipnum" type="text" tabindex="3" name="nm3" size="3"
+			value="<?cs var:Data.Plugins.network.nm.oc3
+		?>" />.<input class="ipnum" type="text" tabindex="4" name="nm4" size="3"
+			value="<?cs var:Data.Plugins.network.nm.oc4 ?>" />
+		</td></tr><tr><td>
+		<?cs var:html_escape(Lang.Plugins.network.Text.GW) ?>:
+		</td><td>
 		<input class="ipnum" type="text" tabindex="1" name="gw1" size="3" id="gw"
 			value="<?cs var:Data.Plugins.network.gw.oc1
 		?>" />.<input class="ipnum" type="text" tabindex="2" name="gw2" size="3"
@@ -38,10 +42,19 @@
 			value="<?cs var:Data.Plugins.network.gw.oc3
 		?>" />.<input class="ipnum" type="text" tabindex="4" name="gw4" size="3"
 			value="<?cs var:Data.Plugins.network.gw.oc4 ?>" />
-
-		<input type="hidden" tabindex="5" name="store" value="set_gw" />
-		<button type="submit"><?cs var:html_escape(Lang.Plugins.network.Button.NetworkGW) ?></button>
+		</td></tr>
+	</table>
+	<p>
+		<?cs call:show_help(Lang.Plugins.network.Help.DHCP) ?>
+		<input type="checkbox" name="dhcp" value="1" id="dhcp" /><label for="dhcp"><?cs var:html_escape(Lang.Plugins.network.Text.DHCP) ?></label>
+	</p><p>
+		<input type="hidden" name="store" value="set_network" />
+		<button type="submit"><?cs var:html_escape(Lang.Plugins.network.Button.Network) ?></button>
 	</p>
 	</form>
 </fieldset>
 
+
+		
+</fieldset>
+
diff --git a/plugins/network/language.hdf b/plugins/network/language.hdf
index 5a6edac..241d958 100644
--- a/plugins/network/language.hdf
+++ b/plugins/network/language.hdf
@@ -1,18 +1,21 @@
 Name	= Configure network
 Link	= Network
 
-Title.Network	= Network settings
+Title	= Network settings
+Title.IP = CryptoBox server
 
-Text.IP	= CryptoBox server address
+Text {
+	IP	= IP address
+	NM = Network mask
+	GW	= Default gateway 
+	DHCP = Automatic configuration (Caution!)
+}
 
-Button.NetworkIP	= Change server address
+Button.Network	= Change network settings
 
-Text.GW	= Default gateway address
-
-Button.NetworkGW	= Change default gateway
-
-
-Help.Network	= Change the network address of the CryptoBox server and the default gateway. Be aware that you may lose your connection to the server under some circumstances.
+Help {
+	Network	= Insert the network address of the CryptoBox server, the network mask and the default gateway. Be aware that you may lose your connection to the server under some circumstances. The actual values are visible in the form fields.
+	DHCP = If you enable automatic network configuration make sure you have a well configured DHCP server running. All values will be overridden by the settings from the DHCP server. If you don't know what DHCP means leave this box unchecked.
 
 WarningMessage {
 	InvalidIP {
diff --git a/plugins/partition/language.hdf b/plugins/partition/language.hdf
index da95549..6f430cb 100644
--- a/plugins/partition/language.hdf
+++ b/plugins/partition/language.hdf
@@ -1,7 +1,7 @@
 Name	= Partition manager
 Link	= Partitions
 
-Title.Partition	= Manage partitions
+Title	= Manage partitions
 
 Button {
 	SelectDevice	= Partition manually
diff --git a/plugins/partition/select_device.cs b/plugins/partition/select_device.cs
index d0e466e..6dc4946 100644
--- a/plugins/partition/select_device.cs
+++ b/plugins/partition/select_device.cs
@@ -1,7 +1,6 @@
 <?cs # $Id$ ?>
 
-<h1><?cs var:html_escape(Lang.Plugins.partition.Title.Partition) ?></h1>
-
+<?cs call:show_plugin_title() ?>
 <?cs call:handle_messages() ?>
 
 <?cs call:show_help(Lang.Plugins.partition.Help.Partitioning) ?>
diff --git a/plugins/partition/set_partitions.cs b/plugins/partition/set_partitions.cs
index c452b32..fceab2d 100644
--- a/plugins/partition/set_partitions.cs
+++ b/plugins/partition/set_partitions.cs
@@ -1,13 +1,11 @@
 <?cs # $Id$ ?>
 
+<?cs call:show_plugin_title() ?>
+<?cs call:handle_messages() ?>
+
 <?cs # show nothing if the harddisk is not partitionable (e.g. still active) ?>
 <?cs if:(Data.Plugins.partition.availSize > 0) || (subcount(Data.Plugins.partition.Parts) > 0) ?>
 
-<h1><?cs var:html_escape(Lang.Plugins.partition.Title.Partition) ?></h1>
-
-<?cs call:handle_messages() ?>
-
-
 <fieldset>
 <legend><?cs var:html_escape(Lang.Plugins.partition.Text.SpecifyPartitions) ?></legend>
 
diff --git a/plugins/plugin_manager/language.hdf b/plugins/plugin_manager/language.hdf
index 9892d9d..cb61574 100644
--- a/plugins/plugin_manager/language.hdf
+++ b/plugins/plugin_manager/language.hdf
@@ -1,8 +1,8 @@
 Name	= Plugin manager
 Link	= Plugins
 
+Title	= Plugin Manager
 Title {
-	PluginManager	= Plugin Manager
 	VolumePlugins	= Volume plugins
 	SystemPlugins	= System plugins
 }
diff --git a/plugins/plugin_manager/plugin_list.cs b/plugins/plugin_manager/plugin_list.cs
index 81954fd..eddfb2c 100644
--- a/plugins/plugin_manager/plugin_list.cs
+++ b/plugins/plugin_manager/plugin_list.cs
@@ -1,7 +1,6 @@
 <?cs # $Id$ ?>
 
-<h1><?cs var:html_escape(Lang.Plugins.plugin_manager.Title.PluginManager) ?></h1>
-
+<?cs call:show_plugin_title() ?>
 <?cs call:handle_messages() ?>
 
 <?cs call:show_help(Lang.Plugins.plugin_manager.Help.PluginManager) ?>
diff --git a/plugins/user_manager/language.hdf b/plugins/user_manager/language.hdf
index 981c294..b4d43bc 100644
--- a/plugins/user_manager/language.hdf
+++ b/plugins/user_manager/language.hdf
@@ -1,8 +1,8 @@
 Name	= User manager
 Link	= Users
 
+Title = User Manager
 Title {
-	UserManager	= Manage users
 	AddUser	= Add new user
 	DelUser	= Remove user
 	ChangePassword	= Change password
diff --git a/plugins/user_manager/user_list.cs b/plugins/user_manager/user_list.cs
index 1a2bc93..26dbc4d 100644
--- a/plugins/user_manager/user_list.cs
+++ b/plugins/user_manager/user_list.cs
@@ -1,9 +1,7 @@
 <?cs # $Id$ ?>
 
-<h1><?cs var:html_escape(Lang.Plugins.user_manager.Title.UserManager) ?></h1>
-
+<?cs call:show_plugin_title() ?>
 <?cs call:handle_messages() ?>
-
 <?cs call:show_help(Lang.Plugins.user_manager.Help.UserManagement) ?>
 
 <fieldset>