--- a/trunk/skins/Cavendish.php
+++ b/trunk/skins/Cavendish.php
@@ -103,7 +103,7 @@
 	 * @access private
 	 */
 	function execute() {
-		global $wgRequest, $cavendishGGplusone, $wgLang;
+		global $wgRequest, $cavendishGGplusone, $cavendishTwitter, $cavendishFacebook, $wgLang;
 		$styleversion = '1.5.0';
 		$this->skin = $skin = $this->data['skin'];
 		$action = $wgRequest->getText( 'action' );
@@ -115,7 +115,7 @@
 		$this->html( 'headelement' );
 ?>
 <div id="internal"></div>
-<!-- Skin-Version: <?php echo $styleversion ?> on MW: <?php echo $verint ?>-->
+<!-- Skin-Version: <?php echo $styleversion ?> //Please leave this for bugtracking purpose//-->
 <div id="globalWrapper" class="<?php echo $action ?>">
 	<div id="p-personal" class="portlet">
 		<h5><?php $this->msg('personaltools') ?></h5>
@@ -164,36 +164,8 @@
 					}
 					echo '>'.htmlspecialchars($tab['text']).'</a></li>';
 				}
-				if ($cavendishGGplusone) {				
+								
 				?>
-				<li id="ca-pluspone">
-					<div id="share-plusone" class="share-wrapper">
-						<g:plusone size="small"></g:plusone>
-					</div>
-				</li>
-				<?php }
-				if ($cavendishTwitter) { ?>
-				
-				<li id="ca-twitter">
-				<div id="share-twitter" class="share-wrapper">
-				<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="WeCoWi" data-lang="de">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
-				</div>
-				</li>
-				
-				<?php }
-				if ($cavendishFacebook) { ?>
-				<li id="ca-facebook"><div id="share-facebook" class="share-wrapper">
-				<div id="fb-root"></div>
-					<script>(function(d, s, id) {
-					  var js, fjs = d.getElementsByTagName(s)[0];
-					  if (d.getElementById(id)) {return;}
-					  js = d.createElement(s); js.id = id;
-					  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
-					  fjs.parentNode.insertBefore(js, fjs);
-					}(document, 'script', 'facebook-jssdk'));</script>
-					<fb:like send="false" layout="button_count" width="60" show_faces="true"></fb:like>
-				</div></li>
-				<?php } ?>
 			</ul></div>
 			<?php $this->searchBox(); ?>
 	</div>
@@ -207,7 +179,7 @@
 		if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true;
 		foreach ($sidebar as $boxName => $cont) {
 			if ( $boxName == 'SEARCH' ) {
-			/*	$this->searchBox();	*/
+//				$this->searchBox();	
 			} elseif ( $boxName == 'TOOLBOX' ) {
 				$this->toolbox();
 			} elseif ( $boxName == 'LANGUAGES' ) {
@@ -216,7 +188,45 @@
 				$this->customBox( $boxName, $cont );
 			}
 		}
-?></div>
+		if ($cavendishTwitter || $cavendishGGplusone || $cavendishFacebook) {
+		?>
+
+<div id="p-social" class="portlet">
+	<h5>Social Networks</h5>
+	<div class="pBody">
+		<ul>
+			<?php if ($cavendishTwitter) { ?>
+			<!-- Twitter -->
+			<li id="twitter"><span class="social">
+			<a href="https://twitter.com/share" class="twitter-share-button" data-via="WeCoWi" data-lang="de">Twittern</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></div>
+			</span>
+			</li>
+			<?php }
+			if ($cavendishGGplusone) { ?>
+			<!-- Google -->
+			<li id="google"><span class="social">
+			<g:plusone size="small"></g:plusone></span>
+			</li>
+			<?php }
+			if ($cavendishFacebook) { ?>
+			<!-- Facebook -->
+			<li id="facebook"><span class="social">
+			<script>(function(d, s, id) {
+					  var js, fjs = d.getElementsByTagName(s)[0];
+					  if (d.getElementById(id)) {return;}
+					  js = d.createElement(s); js.id = id;
+					  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+					  fjs.parentNode.insertBefore(js, fjs);
+					}(document, 'script', 'facebook-jssdk'));</script>
+					<fb:like send="false" layout="button_count" width="60" show_faces="true"></fb:like></span>
+			</li>
+			<?php } ?>
+		</ul>
+	</div>
+	<?php } ?>
+</div>
+</div>
 		</div><!-- end of SIDE div -->
 		<div id="column-content">
 			<div id="content">
@@ -241,6 +251,7 @@
 	<div class="visualClear"></div>
 	<div id="footer">
 		<table>
+			<!--<tr><td colspan="3"><a href="#internal">Up</a></td></tr>-->
 			<tr>
 				<td rowspan="2" class="f-iconsection">
 		<?php if($this->data['copyrightico']) { ?><div id="f-copyrightico"><?php $this->html('copyrightico') ?></div><?php } ?>
@@ -281,7 +292,8 @@
 			</tr>
 			<tr>
 				<td><div id="skin-info">
-					Mozilla Cavendish Theme based on Cavendish style by Gabriel Wicke modified by <a href="http://www.dasch-tour.de" target="_blank">DaSch</a> for the <a href="http://www.wecowi.de/">Web Community Wiki</a> &ndash; Skin-Version: <?php echo $styleversion ?>
+					Mozilla Cavendish Theme based on Cavendish style by Gabriel Wicke modified by <a href="http://www.dasch-tour.de" target="_blank">DaSch</a> for the <a href="http://www.wecowi.de/">Web Community Wiki</a><br/>
+					<a href="http://sourceforge.net/projects/wecowi/">Sourceforge Projectpage</a> &ndash; <a href="https://sourceforge.net/tracker/?group_id=256816&atid=3135768">Report Bug</a> &ndash; Skin-Version: <?php echo $styleversion ?>
 				</div></td>
 			</tr>
 		</table>