fixed all issues - counter bug, swapped templates, feedback msgs, disabling previous