autocomplete
add autocomplete + reorganise a little