Bug fix, removed old button clicking code