Add NAACL pubs; fix layout