fixing a few bugs and adding pick cards polymer element