Move newlines from layout to comments