diff --git a/cv.tex b/cv.tex
index 6535e1e..9717460 100644
--- a/cv.tex
+++ b/cv.tex
@@ -36,7 +36,7 @@
 \begin{document}
 % Draw the avatar and personal detainls
 \headerview{}
-\vspace{1ex}
+\vspace{-0.4cm}
 %Sections
 \begin{multicols}{2}[]
   \vbox{
@@ -105,7 +105,7 @@
     }
     \section{Contributions}
     Linux Kernel, LLVM/Clang, ClojureScript, RubyOnRails, Debian, GNU, Pedestal, and many
-    others.\\[0.2cm]
+    others.\\[0.1cm]
     % Education
     \section{Education}
     \studiedat{Azad University of Yazd}{B.S in Civil Engineering}{2005-2009} % chktex 8
@@ -171,17 +171,18 @@
   \award{3rd place of national CS Olympia}{2003}
   % Volunteer work
   \section{Volunteer Works}
-  {\hspace{0.2cm} \scriptsize{Co-Organizer of:}}\\[0cm]
-  \vspace{-0.9cm}
-  \begin{multicols}{2}[]
-  \volunteer{Karajlug (2008-2017)} \\[0cm]  % chktex 8
-  \volunteer{Clojure Ireland (2018-Present)} \\[0cm]
-  \volunteer{Proud member of \hl{GNU} project}
-  \columnbreak{} \\[0cm]
-  \volunteer{IrPyConf 2013, 2014} \\[0cm]
-  \volunteer{KarajSFD (2010-2014)} \\[0cm]  % chktex 8
-  \end{multicols}
+          {\hspace{0.2cm} \scriptsize{Co-Organizer of:}}
+          \vspace{-0.5cm}
+          \begin{multicols}{2}[]
+            \volunteer{Karajlug (2008-2017)}  % chktex 8
+            \volunteer{Clojure Ireland (2018-Present)}
+            \volunteer{Proud member of \hl{GNU} project}
+            \columnbreak{} \\
+            \volunteer{IrPyConf 2013, 2014}
+            \volunteer{KarajSFD (2010-2014)}   % chktex 8
+          \end{multicols}
   % References
+  \vspace{-0.5cm}
   \section{References}
   {\scriptsize
         {\href{https://lxsameer.com}{\faIcon{link}~https://lxsameer.com}} \\
@@ -189,6 +190,6 @@
         {\href{https://devheroes.codes/lxsameer}{\faIcon{link}~https://devheroes.codes/lxsameer}} \\
         {\href{https://devheroes.codes/Serene}{\faIcon{link}~https://devheroes.codes/Serene}} \\
         {\href{https://github.com/lxsameer}{\faIcon{link}~https://github.com/lxsameer}} (I'm not using github anymore) \\
-        {\href{https://devheroes.codes/lxsameer/CV}{\faIcon{link}~https://devheroes.codes/lxsameer/CV}} (The source of my CV.\@ Yes! it is opensource)}
+        {\href{https://devheroes.codes/lxsameer/CV}{\faIcon{link}~https://devheroes.codes/lxsameer/CV}} (Yes! My CV is opensource)}
 \end{multicols}
 \end{document}
diff --git a/lxsameer_cv.cls b/lxsameer_cv.cls
index a7d0e96..aafa56c 100644
--- a/lxsameer_cv.cls
+++ b/lxsameer_cv.cls
@@ -30,7 +30,7 @@
 \RequirePackage{titlesec}
 \RequirePackage{tikz}
 \RequirePackage{fontspec}
-\RequirePackage[left=0.65in,top=0.3in,right=0.65in,bottom=0.6in]{geometry} % Document margins
+\RequirePackage[left=0.6in,top=0.3in,right=0.6in,bottom=0.6in]{geometry} % Document margins
 \RequirePackage{hyperref}
 \RequirePackage{fontawesome5}
 \RequirePackage{mfirstuc}
@@ -49,8 +49,8 @@
 }
 
 %Setup
-\parskip=0.15cm
-\changefontsizes{11pt}
+\parskip=0.12cm
+\changefontsizes{12pt}
 \newcommand*{\setname}[2]{\def\@firstname{#1}\def\@lastname{#2}}
 \newcommand*{\setjobtitle}[1]{\def\@jobtitle{#1}}
 \newcommand*{\setaddress}[1]{\def\@address{#1}}
@@ -97,8 +97,8 @@
 % Header
 \newcommand\headerview{
     \hspace{-2.2em}
-    \begin{minipage}{0.18\linewidth}
-        \profpic{0.4}{images/avatar}
+    \begin{minipage}{0.14\linewidth}
+        \profpic{0.3}{images/avatar}
     \end{minipage}%
     \name{}
     \hfill
@@ -151,15 +151,12 @@
 \titleformat{\section}
   {\large\bfseries\raggedright\color{headercolor}} % Make the \section headers large (\Large),
                                % small capitals (\scshape) and left aligned (\raggedright)
-  {\color{headercolor}}{0em}   % Can be used to give a prefix to all sections, like 'Section ...'
-  {\color{headercolor} \ruleafter} % Can be used to insert code before the heading
-
+  {}{0em}   % Can be used to give a prefix to all sections, like 'Section ...'
+  {\ruleafter} % Can be used to insert code before the heading
   \titlespacing*{\section}{-1pt}{0pt}{0pt}
 
 \newcommand{\volunteer}[1]{
-  \begin{small}
-    \indent \coloredbullet{} \scriptsize #1
-  \end{small}
+    \indent \coloredbullet{} \scriptsize #1 \\
 }
 
 \newcommand{\datetext}[1]{%
@@ -235,7 +232,7 @@
 }
 
 \newcommand{\jobdesc}[1]{%
-  \mbox{\hspace{1.2em} \scriptsize \desc{#1}}\\[0.3cm]
+  \mbox{\hspace{1.2em} \scriptsize \desc{#1}}\\[0.2cm]
 }
 
 \newcommand{\itemwithtext}[1]{%