Fix some adjustment of the tokenfields. Still need to tweak a little the image files for the tokens