Add caption, focus highlighting, and header support