Updated UI with typeahead... (TEST)