diff --git a/src/site/css/clubs.css b/src/site/css/clubs.css
index fe79d0a..546e863 100644
--- a/src/site/css/clubs.css
+++ b/src/site/css/clubs.css
@@ -43,4 +43,9 @@ table.clubs > tbody  > tr > th
 .clubs_content_row:hover > a > .edit-icon
 {
 	display: inline-block;
-}
\ No newline at end of file
+}
+
+form.clubs-part, form.clubs-part > input
+{
+	margin: 0pt;
+}
diff --git a/src/site/helpers/parts.php b/src/site/helpers/parts.php
index a66ba4c..2404e34 100644
--- a/src/site/helpers/parts.php
+++ b/src/site/helpers/parts.php
@@ -22,7 +22,7 @@ abstract class ClubsHelperParts
         $ret .= "<input type='hidden' name='partname' value='$partname'>";
         $ret .= $this->getEditMarkup();
         $ret .= '&nbsp;<a class="clubs-save" href="#"><span class="icon-ok"></span></a>&nbsp;';
-        $ret .= '<a class="clubs-abort" href="index.php?option=com_clubs&view=mypage&layout=parts&type='.$partname.'"><span class="icon-cancel-2"></span></a>';
+        $ret .= '<a class="clubs-abort" href="index.php?option=com_clubs&view=part&type='.$partname.'"><span class="icon-cancel-2"></span></a>';
         $ret .= '</form>';
         
         return $ret;
@@ -50,7 +50,7 @@ abstract class ClubsHelperParts
     {
         $ret = '';
         
-        $ret = "<a class='clubs-edit' href='index.php?option=com_clubs&view=mypage&layout=parts&mode=edit&type=" . $this->getPartName();
+        $ret = "<a class='clubs-edit' href='index.php?option=com_clubs&view=part&mode=edit&type=" . $this->getPartName(). "'>";
         $ret .= $this->getViewContent();
         $ret .= "<span class='icon-apply clubs-hidden edit-icon' style='font-size: 200%; margin-left: 0.75em;'></span></a>";
         
diff --git a/src/site/views/mypage/tmpl/default.php b/src/site/views/mypage/tmpl/default.php
index 171e795..04a7279 100644
--- a/src/site/views/mypage/tmpl/default.php
+++ b/src/site/views/mypage/tmpl/default.php
@@ -13,10 +13,10 @@ defined('_JEXEC') or die;
 <div class='clubs_row'>
 <div class='clubs_title_row'>Name</div>
 <div class='clubs_content_row'>
-	<a class='clubs-edit' href='index.php?option=com_clubs&view=mypage&layout=parts&mode=edit&type=name'>
-    	<?php echo htmlentities($this->me->getName()); ?>
-    	<span class='icon-apply clubs-hidden edit-icon' style='font-size: 200%; margin-left: 0.75em;'></span>
-	</a>
+	<?php
+	$partHandler = new ClubsPartUserName();
+	echo $partHandler->getViewPart();
+	?>
 </div>
 </div>
 
diff --git a/src/site/views/part/view.html.php b/src/site/views/part/view.html.php
index 4831619..e053d1c 100644
--- a/src/site/views/part/view.html.php
+++ b/src/site/views/part/view.html.php
@@ -2,8 +2,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\View\HtmlView;
-use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\HTML\HTMLHelper;
 
 // No direct access.
 defined('_JEXEC') or die;
@@ -13,16 +11,8 @@ class ClubsViewPart extends HtmlView
     
     public function display($tpl = null)
     {
-//         $auth = new ClubsHelperAuth();
-//         $this->me = $auth->getCurrentUser();
+        // TODO ACLs prüfen?
         
-//         $this->clubsPresident = $this->me->getPresidentClubs();
-//         $this->positions = $this->me->getPositions();
-        
-//         HTMLHelper::_('jquery.framework');
-//         Factory::getDocument()->addScript(Uri::base(true) .  "components/com_clubs/js/edit.js");
-//         parent::display($tpl);
-
         $app = Factory::getApplication();
         $input = $app->input;