Updated Dialog and TokenField contribs