add boarders and using \newcommand to make code cleaner