Fix up formatting of ARF draft, add some hierarchy