updated vocabularies for website with links and searches and better buttons