diff --git a/admin_clients.php b/admin_clients.php
index ee91d58a..6e1d8903 100644
--- a/admin_clients.php
+++ b/admin_clients.php
@@ -190,6 +190,36 @@ if((int)$settings['multiserver']['enabled'] == 1)
 			}
 			else
 			{
+				/**
+				 * @TODO
+				 * - show all client settings
+				 * - validate settings
+				 */ 
+				echo $header;
+				echo "Here you will see the clients configuration, you will know most of the settings from the 'master'-panel already";
+				echo $footer;
+			}
+		}
+		/**
+		 * deploy client to the destination server 
+		 */
+		elseif($action == 'deploy'
+			&& $id != 0
+		) {
+			$client = froxlorclient::getInstance($userinfo, $db, $id);
+
+			if(isset($_POST['send'])
+				&& $_POST['send'] == 'send')
+			{
+			}
+			else
+			{
+				/**
+				 * @TODO 
+				 * - validate client-settings
+				 * - validate client ssh connection (test?)
+				 */
+				echo "Here the client's settings and ssh-connection will be validated";
 			}
 		}
 	}
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 186c9373..4bc05ed0 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1526,6 +1526,7 @@ $lng['admin']['froxlorclients']['name'] = 'Client name';
 $lng['admin']['froxlorclients']['desc'] = 'Client description';
 $lng['admin']['froxlorclients']['enabled'] = 'Client enabled?';
 $lng['admin']['froxlorclients']['settings'] = 'settings';
+$lng['admin']['froxlorclients']['deploy'] = 'deploy';
 $lng['menue']['multiserver']['clients'] = 'Multiserver clients';
 $lng['admin']['froxlorclient'] = 'Multiserver client settings';
 $lng['froxlorclient']['ipaddress'] = 'Client IP';
diff --git a/templates/admin/froxlorclients/froxlorclients.tpl b/templates/admin/froxlorclients/froxlorclients.tpl
index 99608a48..09939fd9 100644
--- a/templates/admin/froxlorclients/froxlorclients.tpl
+++ b/templates/admin/froxlorclients/froxlorclients.tpl
@@ -4,24 +4,24 @@ $header
                 <input type="hidden" name="page" value="$page"/>
 		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
 			<tr>
-				<td class="maintitle_search_left" colspan="4"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['menue']['multiserver']['clients']}</b></td>
-				<td class="maintitle_search_right" colspan="3">{$searchcode}</td>
+				<td class="maintitle_search_left" colspan="3"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['menue']['multiserver']['clients']}</b></td>
+				<td class="maintitle_search_right" colspan="2">{$searchcode}</td>
 			</tr>
 			<tr>
 				<td class="field_display_border_left">ID#&nbsp;{$arrowcode['id']}</td>
 				<td class="field_display">{$lng['admin']['froxlorclients']['name']}&nbsp;{$arrowcode['name']}</td>
 				<td class="field_display">{$lng['admin']['froxlorclients']['desc']}</td>
 				<td class="field_display">{$lng['admin']['froxlorclients']['enabled']}&nbsp;{$arrowcode['enabled']}</td>
-				<td class="field_display_search" colspan="3">{$sortcode}</td>
+				<td class="field_display_search">{$sortcode}</td>
 			</tr>
 			$froxlorclients
 			<if $pagingcode != ''>
 			<tr>
-				<td class="field_display_border_left" colspan="7" style=" text-align: center; ">{$pagingcode}</td>
+				<td class="field_display_border_left" colspan="5" style=" text-align: center; ">{$pagingcode}</td>
 			</tr>
 			</if>
 			<tr>
-				<td class="field_display_border_left" colspan="7"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['froxlorclients']['add']}</a></td>
+				<td class="field_display_border_left" colspan="5"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['froxlorclients']['add']}</a></td>
 			</tr>
 		</table>
 	</form>
diff --git a/templates/admin/froxlorclients/froxlorclients_client.tpl b/templates/admin/froxlorclients/froxlorclients_client.tpl
index 6dcfd4f6..0674a45e 100644
--- a/templates/admin/froxlorclients/froxlorclients_client.tpl
+++ b/templates/admin/froxlorclients/froxlorclients_client.tpl
@@ -3,7 +3,10 @@
 	<td class="field_name">{$row['name']}</td>
 	<td class="field_name">{$row['desc']}</td>
 	<td class="field_name">{$row['enabled']}</td>
-	<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=settings&amp;id={$row['id']}">{$lng['admin']['froxlorclients']['settings']}</a></td>
-	<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['id']}">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['id']}">{$lng['panel']['delete']}</a></td>
+	<td class="field_name">
+		<a href="$filename?s=$s&amp;page=$page&amp;action=settings&amp;id={$row['id']}">{$lng['admin']['froxlorclients']['settings']}</a>&nbsp;
+		<a href="$filename?s=$s&amp;page=$page&amp;action=deploy&amp;id={$row['id']}">{$lng['admin']['froxlorclients']['deploy']}</a>&nbsp;
+		<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['id']}">{$lng['panel']['edit']}</a>&nbsp;
+		<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['id']}">{$lng['panel']['delete']}</a>
+	</td>
 </tr>