Changed markup for subscribe buttons and minor changes in the logic for subscribing