Change token shuffle process, add tokens, do a little for responsive design