improved token view