Updating some spacing and style