Added proper spacing and added proper underline