Added subscription renewal date, re-layout currentSubscriptions due to volume of data now