diff --git a/template.jinja b/template.jinja
index 68794f6..af38435 100644
--- a/template.jinja
+++ b/template.jinja
@@ -1,17 +1,11 @@
 %!TEX TS-program = xelatex
 %!TEX encoding = UTF-8 Unicode
-% Awesome CV LaTeX Template
+% Alicia's CV LaTeX Template
 %
-% This template has been downloaded from:
+% This template is heaviliy inspired by:
 % https://github.com/posquit0/Awesome-CV
-%
-% Author:
-% Claud D. Park <posquit0.bj@gmail.com>
-% http://www.posquit0.com
-%
-% Template license:
-% CC BY-SA 4.0 (https://creativecommons.org/licenses/by-sa/4.0/)
-%
+% By Claud D. Park <http://www.posquit0.com>
+% 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %     Configuration
@@ -80,6 +74,7 @@
 {%- endfor %}
 \end{cventries}
 {% if extra_links.work_history %}
+    \vspace{-5mm}
     \begin{flushright}
         \small\color{lightgray} \href{ {{ extra_links.work_history.link | latex_escape }} }{{ extra_links.work_history.text | latex_escape }}
     \end{flushright}
@@ -110,7 +105,7 @@
     { {{ edu.institution | latex_escape }} }
     {}
     {}
-    {GPA: {{ edu.score | latex_escape }}}
+    {Grade: {{ edu.score | latex_escape }}}
 {%- endfor %}
 \end{cventries}
 {% endif %}
@@ -132,6 +127,7 @@
     {}
 \end{cventries}
 {% if extra_links.projects %}
+    \vspace{-10mm}
     \begin{flushright}
         \small\color{lightgray} \href{ {{ extra_links.projects.link | latex_escape }} }{{ extra_links.projects.text | latex_escape }}
     \end{flushright}
@@ -153,8 +149,9 @@
 \end{cvhonors}
 {% endif %}
 % Add the footer link at the end of the document
-\begin{flushright}
-    \small\color{lightgray} \shorturl{https://github.com/lissy93/cv}{View CV source at github.com/lissy93/cv}
-\end{flushright}
+\vspace{10mm}
+\begin{flushleft}
+    \tiny\color{lightgray} \href{https://github.com/lissy93/cv}{ View CV source at github.com/lissy93/cv}
+\end{flushleft}
 \ 
 \end{document}
diff --git a/tex/awesome-cv.cls b/tex/awesome-cv.cls
index 84978f2..de00629 100644
--- a/tex/awesome-cv.cls
+++ b/tex/awesome-cv.cls
@@ -108,7 +108,7 @@
 %-------------------------------------------------------------------------------
 %% Page Layout
 % Configure page margins with geometry
-\geometry{left=2.0cm, top=1.5cm, right=2.0cm, bottom=2.0cm, footskip=.5cm}
+\geometry{left=2.0cm, top=1cm, right=2.0cm, bottom=1cm, footskip=.5cm}
 
 %% Header & Footer
 % Set offset to each header and offset
@@ -215,6 +215,23 @@
   BoldItalicFont=*-BoldItalic
 ]{Roboto}
 
+% Needed to manage fonts
+\ifxetex
+  \RequirePackage[quiet]{fontspec}
+  % To support LaTeX quoting style
+  \defaultfontfeatures{Ligatures=TeX}
+  \setmainfont[
+    Path=\@fontdir,
+    UprightFont=*-Regular,
+    ItalicFont=*-Italic,
+    BoldFont=*-Bold,
+    BoldItalicFont=*-BoldItalic,
+  ]{Roboto}
+\else
+  \RequirePackage[T1]{fontenc}
+  % Replace by the encoding you are using
+  \RequirePackage[utf8]{inputenc}
+\fi
 
 %-------------------------------------------------------------------------------
 %                Configuration for styles