diff --git a/rendercv/rendercv.py b/rendercv/rendercv.py
index 8485252..c20d11a 100644
--- a/rendercv/rendercv.py
+++ b/rendercv/rendercv.py
@@ -26,7 +26,7 @@ if __name__ == "__main__":
 
     template = environment.get_template(f"{templateName}.tex.j2")
 
-    input_file_path = os.path.join(workspace, "tests", "inputs", "test.json")
+    input_file_path = os.path.join(workspace, "tests", "inputs", "personal.json")
     with open(input_file_path) as file:
         raw_json = json.load(file)
 
diff --git a/rendercv/templates/classic/components/education.tex.j2 b/rendercv/templates/classic/components/education.tex.j2
index dafd215..65b47fe 100644
--- a/rendercv/templates/classic/components/education.tex.j2
+++ b/rendercv/templates/classic/components/education.tex.j2
@@ -9,7 +9,7 @@
         ((# second column: X; variable width, ragged left column #))
         ((# third column: R{<<design.date_and_location_width>>}; constant widthm ragged right column #))
 \begin{tabularx}{\textwidth}{p{0.55cm} X R{<<design.date_and_location_width>>}}
-    \textbf{<<study_type>>}
+    \textbf{<<study_type if study_type is not none>>}
     & 
     \textbf{<<institution>>}, <<area>>
 
diff --git a/rendercv/templates/classic/components/header.tex.j2 b/rendercv/templates/classic/components/header.tex.j2
index 96c9fac..673f0ec 100644
--- a/rendercv/templates/classic/components/header.tex.j2
+++ b/rendercv/templates/classic/components/header.tex.j2
@@ -7,6 +7,9 @@
     \normalsize
 ((* for connection in connections *))
     <<print_connections[connection.name](connection.value)>>
+    ((* if not loop.last *))
+    \hspace{0.5cm}
+    ((* endif *))
 ((* endfor *))
 
 \end{header}
diff --git a/rendercv/templates/classic/components/header_connections.tex.j2 b/rendercv/templates/classic/components/header_connections.tex.j2
index ae75b47..fa7161b 100644
--- a/rendercv/templates/classic/components/header_connections.tex.j2
+++ b/rendercv/templates/classic/components/header_connections.tex.j2
@@ -2,7 +2,7 @@
 ((* macro LinkedIn(username) *))\href{https://www.linkedin.com/in/<<username>>}{\faLinkedin\hspace{0.13cm}<<username>>}((* endmacro *))
 ((* macro GitHub(username) *))\href{https://www.github.com/<<username>>}{\faGithub\hspace{0.13cm}<<username>>}((* endmacro *))
 ((* macro Instagram(username) *))\href{https://www.instagram.com/<<username>>}{\faInstagram\hspace{0.13cm}<<username>>}((* endmacro *))
-((* macro phone(number) *))\faPhone\hspace{0.13cm}#2 \hspace{0.5cm}((* endmacro *))
-((* macro email(email) *))\href{mailto:<<email>>}{\faEnvelopeO\hspace{0.13cm}<<email>>} \hspace{0.5cm}((* endmacro *))
-((* macro website(url) *))\href{<<url>>}{\faLaptop\hspace{0.13cm}url} \hspace{0.5cm}((* endmacro *))
+((* macro phone(number) *))\faPhone\hspace{0.13cm}<<number|replace("tel:", "")|replace("-"," ")>>((* endmacro *))
+((* macro email(email) *))\href{mailto:<<email>>}{\faEnvelope[regular]\hspace{0.13cm}<<email>>}((* endmacro *))
+((* macro website(url) *))\href{<<url>>}{\faLaptop\hspace{0.13cm}url}((* endmacro *))
 
diff --git a/tests/inputs/test.json b/tests/inputs/test.json
index f154acb..33ea073 100644
--- a/tests/inputs/test.json
+++ b/tests/inputs/test.json
@@ -23,13 +23,11 @@
         "social_networks": [
             {
                 "network": "LinkedIn",
-                "username": "sinaatalay",
-                "url": "https://www.linkedin.com/in/sinaatalay"
+                "username": "sinaatalay"
             },
             {
                 "network": "GitHub",
-                "username": "sinaatalay",
-                "url": "https://github.com/sinaatalay"
+                "username": "sinaatalay"
             }
         ],
         "education": [