fix text field/text area indexing and add labels for listing components