Better spacing and css change