diff --git a/README.md b/README.md
index b2da7cf..e649f53 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # A LaTeX template for DHSN Dresden
 
-This repository contains a LaTeX template, which tries to follow the [DHSN Dresden Styleguide](https://dresden.ba-sn.de/fileadmin/M3__BA_Dresden/downloads/zentrale-dokumente/Leitfaden_wissentschaftliche_Arbeiten.pdf) as close as possible.
+This repository contains a LaTeX template, which tries to follow the [DHSN Dresden Styleguide](https://www.ba-dresden.de/fileadmin/M3__BA_Dresden/downloads/zentrale-dokumente/Leitfaden_wissentschaftliche_Arbeiten.pdf) as close as possible.
 **The template might do things wrong and there is no warranty. It is your own responsibility to check for correctness.**
 
 ## Enduser Documentation
diff --git a/baarticle.cls b/baarticle.cls
index 18297f2..316270f 100644
--- a/baarticle.cls
+++ b/baarticle.cls
@@ -342,24 +342,25 @@
 
     \bigskip\par
     \par\noindent
-    \@baclslast{}, \@baclsfirst{} \vspace{-8pt} \\
-    \rule{0.4\textwidth}{0.5pt} \\
+    \space \@baclslast{}, \@baclsfirst{} \vspace{-14pt} \\
+    \rule{0.4\textwidth}{0.5pt} \vspace{-6pt}\\
     \noindent
-    Name, Vorname Verfassender
+    \makebox[0.4\textwidth][l]{\space Name, Vorname Verfassender}
 
     \begin{wrapfigure}[1]{r}{0.3\textwidth}
         \begin{center}
-            \vspace{-40pt}
+            \vspace{-46pt}
+            \hspace{-50pt}
             \includegraphics[width=0.28\textwidth]{\@baaffirsignature}
         \end{center}
     \end{wrapfigure}
     \bigskip
 
     \par\noindent
-    \@baclslocation{}, \@baaffirdate{} \vspace{-8pt} \\
-    \rule{0.4\textwidth}{0.5pt}\hfill \rule{0.4\textwidth}{0.5pt}\\
+    \space \@baclslocation{}, \@baaffirdate{} \vspace{-14pt} \\
+    \rule{0.4\textwidth}{0.5pt}\hfill \rule{0.4\textwidth}{0.5pt}\vspace{-6pt} \\
     \noindent
-    Ort, Datum Abgabetermin\hfill Unterschrift Verfassender
+    \makebox[0.4\textwidth][l]{\space Ort, Datum Abgabetermin}\hfill \makebox[0.4\textwidth][l]{\space Unterschrift Verfassender} \\
 }
 
 % Frontmatter