Switching to a nested structure.
Adding autocomplete specific theming.