Fix line endings; fix layout