Added propper spacing and font sizes