Fix spacing and id errors