Added expired subscription modal
Bug fixing