Subscription button status' on page are now correctly being set