Button and deck added, and more improvements