added in the button work in subscription page
merge with development branch and merged conflict on subscriptions