diff --git a/.gitignore b/.gitignore
index 17c517ffa..5a92c6615 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,4 +67,4 @@ docs
 
 # editor files
 .vscode
-.tsconfig
+tsconfig.json
diff --git a/.travis.yml b/.travis.yml
index 6222310a2..2e1261c1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,9 +34,7 @@ before_install:
   - npm install -g coveralls
 script:
   - npm link
-  - npm test
+  - npm test -- --coverage
+  - coveralls < ./.coverage/lcov.info || true
   - "./.scripts/prepare/app.sh"
   - "./.scripts/deploy/app.sh"
-after_success:
-  - jest --coverage
-  - coveralls < ./.coverage/lcov.info || true
diff --git a/imports/blocks/add-schedule/index.js b/imports/blocks/add-schedule/index.js
index ecc253401..2836bb15c 100644
--- a/imports/blocks/add-schedule/index.js
+++ b/imports/blocks/add-schedule/index.js
@@ -14,7 +14,7 @@ type ICartContainer = {
   accounts: Object,
   addTransactions: Function,
   alive: boolean,
-  clearAllSchedulesExcept: Function,
+  // clearAllSchedulesExcept: Function,
   clearSchedules: Function,
   clearTransactions: Function,
   existing: Object,
@@ -72,9 +72,9 @@ class CartContainer extends Component {
   }
 
   componentWillReceiveProps(nextProps: Object) {
-    const { transactions, schedules } = nextProps.give;
+    const { transactions, schedule } = nextProps.give;
 
-    if (Object.keys(transactions).length === 0 && Object.keys(schedules).length === 0) {
+    if (transactions && Object.keys(transactions).length === 0 && schedule && !schedule.start) {
       const form: FormElement = (document.getElementById("add-to-cart"): any);
       if (form) form.reset();
     }
@@ -93,10 +93,9 @@ class CartContainer extends Component {
 
     let keepGoing = true;
     if (cartFundId && cartTotal && cartFundLabel) {
-      this.props.clearAllSchedulesExcept(Number(this.state.fundId));
+      // this.props.clearAllSchedulesExcept(Number(this.state.fundId));
 
-      this.props.saveSchedule(this.state.fundId, {
-        label: this.state.fundLabel,
+      this.props.saveSchedule({
         frequency: this.state.frequency,
         start: this.state.startDate,
       });
@@ -122,8 +121,7 @@ class CartContainer extends Component {
     if (this.state.fundId !== id) this.props.removeSchedule(this.state.fundId);
 
     this.setState({ fundId: id, fundLabel: name });
-    this.props.saveSchedule(id, {
-      label: name,
+    this.props.saveSchedule({
       frequency: this.state.frequency,
       start: this.state.startDate,
     });
@@ -134,7 +132,7 @@ class CartContainer extends Component {
   setFrequency = (value: string) => {
     this.setState({ frequency: value });
     if (this.state.fundId) {
-      this.props.saveSchedule(this.state.fundId, { frequency: value });
+      this.props.saveSchedule({ frequency: value });
     }
   }
 
@@ -172,7 +170,7 @@ class CartContainer extends Component {
 
     this.setState({ startDate: date });
 
-    if (fundId) this.props.saveSchedule(fundId, { start: new Date(value) });
+    if (fundId) this.props.saveSchedule({ start: new Date(value) });
     return true;
   }
 
diff --git a/imports/blocks/add-to-cart/index.js b/imports/blocks/add-to-cart/index.js
index a579cabd0..be1df2a52 100644
--- a/imports/blocks/add-to-cart/index.js
+++ b/imports/blocks/add-to-cart/index.js
@@ -4,7 +4,6 @@ import { Component } from "react";
 import { connect } from "react-redux";
 
 import { give as giveActions } from "../../store";
-import { monetize } from "../../util/format/currency";
 import Layout from "./Layout";
 
 type IStore = {
@@ -249,7 +248,7 @@ class CartContainer extends Component {
   preFillValue = (id: string) => {
     if (!this.state.subfunds.length) return null;
     const fund = this.state.subfunds.filter(({ fundId }) => fundId === id);
-    return fund[0] && fund[0].amount && monetize(`${fund[0].amount}`.replace(/[^0-9\.]+/g, ""));
+    return fund[0] && fund[0].amount && `$${String(fund[0].amount).replace(/[^0-9\.]+/g, "")}`;
   }
 
   toggleSecondFund = () => {
diff --git a/imports/blocks/give/fieldsets/confirm/__tests__/__snapshots__/TransactionLayout.js.snap b/imports/blocks/give/fieldsets/confirm/__tests__/__snapshots__/TransactionLayout.js.snap
index e0b605bfb..b026797ae 100644
--- a/imports/blocks/give/fieldsets/confirm/__tests__/__snapshots__/TransactionLayout.js.snap
+++ b/imports/blocks/give/fieldsets/confirm/__tests__/__snapshots__/TransactionLayout.js.snap
@@ -278,7 +278,7 @@ exports[`TransactionLayout should render with a schedule props 1`] = `
       className="btn soft-half-top one-whole"
       type="submit">
       <span>
-        Schedule Using 6789
+        Schedule With 6789
       </span>
          
       <div
@@ -509,7 +509,7 @@ exports[`TransactionLayout should render with props 1`] = `
       className="btn soft-half-top one-whole"
       type="submit">
       <span>
-        Give Using 6789
+        Give With 6789
       </span>
          
       <div
diff --git a/imports/blocks/give/fieldsets/shared/ActionButton.js b/imports/blocks/give/fieldsets/shared/ActionButton.js
index e0c9f78be..6c714d71c 100644
--- a/imports/blocks/give/fieldsets/shared/ActionButton.js
+++ b/imports/blocks/give/fieldsets/shared/ActionButton.js
@@ -37,7 +37,19 @@ const ActionButton = ({
           className="btn soft-half-top one-whole"
           onClick={completeGift}
         >
-          Complete Gift in Browser
+          <ButtonText
+            payment={payment}
+            savedAccount={savedAccount}
+            schedule={schedule}
+            scheduleToRecover={scheduleToRecover}
+            overrideText="Complete Using"
+          />
+          &nbsp;&nbsp;
+          <Icon
+            cardType={
+              cardType(payment, savedAccount)
+            }
+          />
         </button>
       </div>
     );
diff --git a/imports/blocks/give/fieldsets/shared/ButtonText.js b/imports/blocks/give/fieldsets/shared/ButtonText.js
index 9c644f09d..0675ed607 100644
--- a/imports/blocks/give/fieldsets/shared/ButtonText.js
+++ b/imports/blocks/give/fieldsets/shared/ButtonText.js
@@ -5,6 +5,7 @@ type IButtonText = {
   savedAccount: Object,
   schedule: Object,
   scheduleToRecover: boolean,
+  overrideText?: string,
 };
 
 const ButtonText = ({
@@ -12,6 +13,7 @@ const ButtonText = ({
   savedAccount,
   schedule,
   scheduleToRecover,
+  overrideText,
 }: IButtonText) => {
   let paymentInfo = payment;
 
@@ -24,10 +26,11 @@ const ButtonText = ({
 
   if (schedule.start) text = "Schedule";
   if (scheduleToRecover) text = "Transfer";
+  if (overrideText) text = overrideText;
 
   if (paymentInfo.accountNumber || paymentInfo.cardNumber) {
     const masked = paymentInfo.type === "ach" ? paymentInfo.accountNumber : paymentInfo.cardNumber;
-    text += ` Using ${masked.replace(/-/g, "").slice(-4)}`;
+    text += ` With ${masked.replace(/-/g, "").slice(-4)}`;
   }
 
   return <span>{text}</span>;
diff --git a/imports/blocks/give/fieldsets/shared/__tests__/ButtonText.js b/imports/blocks/give/fieldsets/shared/__tests__/ButtonText.js
index 8581030b1..93dc969b8 100644
--- a/imports/blocks/give/fieldsets/shared/__tests__/ButtonText.js
+++ b/imports/blocks/give/fieldsets/shared/__tests__/ButtonText.js
@@ -16,26 +16,26 @@ const generateComponent = (additionalProps = {}) => {
   return <ButtonText { ...newProps } />
 };
 
-it("should say `Give Now` with minimal props", () => {
+it("should say `Give` with minimal props", () => {
   const result = renderer.create(generateComponent());
   expect(result).toMatchSnapshot();
 });
 
-it("should say `Schedule Now` if schedule present", () => {
+it("should say `Schedule` if schedule present", () => {
   const result = renderer.create(generateComponent({
     schedule: { start: "now", frequency: null },
   }));
   expect(result).toMatchSnapshot();
 });
 
-it("should say `Transfer Now` if recoverable schedule", () => {
+it("should say `Transfer` if recoverable schedule", () => {
   const result = renderer.create(generateComponent({
     scheduleToRecover: true,
   }));
   expect(result).toMatchSnapshot();
 });
 
-it("should say `Give Now using 6789` if accountNumber", () => {
+it("should say `Give With 6789` if accountNumber", () => {
   const result = renderer.create(generateComponent({
     payment: {
       type: "ach",
@@ -45,7 +45,7 @@ it("should say `Give Now using 6789` if accountNumber", () => {
   expect(result).toMatchSnapshot();
 });
 
-it("should say `Give Now using 4321` if cardNumber", () => {
+it("should say `Give With 4321` if cardNumber", () => {
   const result = renderer.create(generateComponent({
     payment: {
       type: "card",
@@ -55,7 +55,7 @@ it("should say `Give Now using 4321` if cardNumber", () => {
   expect(result).toMatchSnapshot();
 });
 
-it("should say `Schedule Now using 6789` if schedule and accountNumber", () => {
+it("should say `Schedule With 6789` if schedule and accountNumber", () => {
   const result = renderer.create(generateComponent({
     payment: {
       type: "ach",
@@ -66,7 +66,7 @@ it("should say `Schedule Now using 6789` if schedule and accountNumber", () => {
   expect(result).toMatchSnapshot();
 });
 
-it("should say `Schedule Now using 4321` if schedule and cardNumber", () => {
+it("should say `Schedule With 4321` if schedule and cardNumber", () => {
   const result = renderer.create(generateComponent({
     payment: {
       type: "card",
@@ -77,7 +77,7 @@ it("should say `Schedule Now using 4321` if schedule and cardNumber", () => {
   expect(result).toMatchSnapshot();
 });
 
-it("should say `Transfer Now using 6789` if recoverable schedule and accountNumber", () => {
+it("should say `Transfer With 6789` if recoverable schedule and accountNumber", () => {
   const result = renderer.create(generateComponent({
     payment: {
       type: "ach",
@@ -88,7 +88,7 @@ it("should say `Transfer Now using 6789` if recoverable schedule and accountNumb
   expect(result).toMatchSnapshot();
 });
 
-it("should say `Transfer Now using 4321` if schedule and cardNumber", () => {
+it("should say `Transfer With 4321` if schedule and cardNumber", () => {
   const result = renderer.create(generateComponent({
     payment: {
       type: "card",
diff --git a/imports/blocks/give/fieldsets/shared/__tests__/__snapshots__/ActionButton.js.snap b/imports/blocks/give/fieldsets/shared/__tests__/__snapshots__/ActionButton.js.snap
index 1543e562a..f733f69c7 100644
--- a/imports/blocks/give/fieldsets/shared/__tests__/__snapshots__/ActionButton.js.snap
+++ b/imports/blocks/give/fieldsets/shared/__tests__/__snapshots__/ActionButton.js.snap
@@ -11,7 +11,22 @@ exports[`test should render iOS action button 1`] = `
   <button
     className="btn soft-half-top one-whole"
     onClick={[Function]}>
-    Complete Gift in Browser
+    <span>
+      Complete Using With 6789
+    </span>
+      
+    <div
+      className="background--fill display-inline-block"
+      style={
+        Object {
+          "backgroundImage": "url(\'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAABGdBTUEAALGPC/xhBQAAAc9JREFUeAHt3DFOwzAUxnGcROoMEx04Q4/AoSraoXMWqp4DjgFH4AwgdWvnDlV4FoyOn+xPlVrlnwEJ+32h/eWlcqjkcGfHbrd7Op1Or8MwPNuv8zjGMSqwDyF8tG27Wq/XP+Ef78vw7kcjTKQEDl3XLRrrvC14KR937OF8Pm8bK4u3LUeFQPzIa+zHY0WWyJ/APHYghyDQjWU3m00Ym5vieN/3Q+p904EplYIxAAuwUqUAplQKxgAswEqVAphSKRgDsAArVQpgSqVgDMACrFQpgCmVgrHRJxHvHGMrcy93rfO1T150oHhFAQRQFBDjdCCAooAYpwMBFAXEePU6sHbdJL7eq4tzC4uXBEAARQExTgcCKAqIcToQQFFAjNOBAIoCYrz6SeTS/5G+lScdbmGxAwEEUBQQ43QggKKAGKcDARQFxHj1OvBW1mmijxvnFnaJ8gUA5n3cWQBdonwBgHkfdxZAlyhfAGDex50F0CXKFwCY93FnAXSJ8gUA5n3cWQBdonxBuPR3G/k/f/uzdKB4DSPgXjzHlOP7xjaR+ZyygPLeo11jO/C82EkOyommmDW842w2WzVx+6K4A48NvBkEt7PfDXHrp3fDWyyXy+9ftplH0FR79EYAAAAASUVORK5CYII=\')",
+          "borderRadius": "3px",
+          "height": "21px",
+          "position": "inherit",
+          "top": "3px",
+          "width": "30px",
+        }
+      } />
   </button>
 </div>
 `;
@@ -21,7 +36,7 @@ exports[`test should render web action button 1`] = `
   className="btn soft-half-top one-whole"
   type="submit">
   <span>
-    Give Using 6789
+    Give With 6789
   </span>
      
   <div
diff --git a/imports/blocks/give/fieldsets/shared/__tests__/__snapshots__/ButtonText.js.snap b/imports/blocks/give/fieldsets/shared/__tests__/__snapshots__/ButtonText.js.snap
index 149e64349..32fb96055 100644
--- a/imports/blocks/give/fieldsets/shared/__tests__/__snapshots__/ButtonText.js.snap
+++ b/imports/blocks/give/fieldsets/shared/__tests__/__snapshots__/ButtonText.js.snap
@@ -1,52 +1,52 @@
-exports[`test should say \`Give Now using 4321\` if cardNumber 1`] = `
+exports[`test should say \`Give With 4321\` if cardNumber 1`] = `
 <span>
-  Give Using 4321
+  Give With 4321
 </span>
 `;
 
-exports[`test should say \`Give Now using 6789\` if accountNumber 1`] = `
+exports[`test should say \`Give With 6789\` if accountNumber 1`] = `
 <span>
-  Give Using 6789
+  Give With 6789
 </span>
 `;
 
-exports[`test should say \`Give Now\` with minimal props 1`] = `
+exports[`test should say \`Give\` with minimal props 1`] = `
 <span>
   Give
 </span>
 `;
 
-exports[`test should say \`Schedule Now using 4321\` if schedule and cardNumber 1`] = `
+exports[`test should say \`Schedule With 4321\` if schedule and cardNumber 1`] = `
 <span>
-  Schedule Using 4321
+  Schedule With 4321
 </span>
 `;
 
-exports[`test should say \`Schedule Now using 6789\` if schedule and accountNumber 1`] = `
+exports[`test should say \`Schedule With 6789\` if schedule and accountNumber 1`] = `
 <span>
-  Schedule Using 6789
+  Schedule With 6789
 </span>
 `;
 
-exports[`test should say \`Schedule Now\` if schedule present 1`] = `
+exports[`test should say \`Schedule\` if schedule present 1`] = `
 <span>
   Schedule
 </span>
 `;
 
-exports[`test should say \`Transfer Now using 4321\` if schedule and cardNumber 1`] = `
+exports[`test should say \`Transfer With 4321\` if schedule and cardNumber 1`] = `
 <span>
-  Transfer Using 4321
+  Transfer With 4321
 </span>
 `;
 
-exports[`test should say \`Transfer Now using 6789\` if recoverable schedule and accountNumber 1`] = `
+exports[`test should say \`Transfer With 6789\` if recoverable schedule and accountNumber 1`] = `
 <span>
-  Transfer Using 6789
+  Transfer With 6789
 </span>
 `;
 
-exports[`test should say \`Transfer Now\` if recoverable schedule 1`] = `
+exports[`test should say \`Transfer\` if recoverable schedule 1`] = `
 <span>
   Transfer
 </span>
diff --git a/imports/pages/give/history/Filter.js b/imports/pages/give/history/Filter.js
index 0315b4fc7..4c2394eb4 100644
--- a/imports/pages/give/history/Filter.js
+++ b/imports/pages/give/history/Filter.js
@@ -9,7 +9,7 @@ import Date from "../../../blocks/add-to-cart/Schedule/Date";
 const DATE_RANGES = [
   { label: "Last Month", value: "LastMonth" },
   { label: "Last 6 Months", value: "LastSixMonths" },
-  { label: "Last Year", value: "LastYear" },
+  { label: "Year To Date", value: "YearToDate" },
   { label: "All Time", value: "AllTime" },
 ];
 
@@ -91,8 +91,8 @@ export default class Filter extends Component {
       } else if (value === "LastSixMonths") {
         startDate = moment().subtract(6, "months");
         endDate = moment();
-      } else if (value === "LastYear") {
-        startDate = moment().subtract(12, "months");
+      } else if (value === "YearToDate") {
+        startDate = moment().startOf("year");
         endDate = moment();
       } else {
         transactionLimit = 0;
diff --git a/imports/pages/give/history/__tests__/Filter.js b/imports/pages/give/history/__tests__/Filter.js
index f1b2c18a0..e4f982905 100644
--- a/imports/pages/give/history/__tests__/Filter.js
+++ b/imports/pages/give/history/__tests__/Filter.js
@@ -192,7 +192,7 @@ it("dataRangeClick with LastSixMonths value sets the start and end dates correct
   expect(wrapper.state().end).toEqual("");
 })
 
-it("dataRangeClick with LastYear value sets the start and end dates correctly", () => {
+it("dataRangeClick with YearToDate value sets the start and end dates correctly", () => {
   const wrapper = shallow(generateComponent());
   wrapper.setState({
     start: "",
@@ -200,12 +200,12 @@ it("dataRangeClick with LastYear value sets the start and end dates correctly",
   });
 
   // this should set a 1 year range
-  wrapper.instance().dateRangeClick("LastYear");
-  expect(moment(wrapper.state().start).format("L")).toEqual(moment().subtract(12, "months").format("L"));
+  wrapper.instance().dateRangeClick("YearToDate");
+  expect(moment(wrapper.state().start).format("L")).toEqual(moment().startOf("year").format("L"));
   expect(moment(wrapper.state().end).format("L")).toEqual(moment().format("L"));
 
   // calling it again should reset the start and end dates
-  wrapper.instance().dateRangeClick("LastYear");
+  wrapper.instance().dateRangeClick("YearToDate");
   expect(wrapper.state().start).toEqual("");
   expect(wrapper.state().end).toEqual("");
 })
diff --git a/imports/pages/give/history/__tests__/__snapshots__/Filter.js.snap b/imports/pages/give/history/__tests__/__snapshots__/Filter.js.snap
index 116b4b22a..2ce2d8919 100644
--- a/imports/pages/give/history/__tests__/__snapshots__/Filter.js.snap
+++ b/imports/pages/give/history/__tests__/__snapshots__/Filter.js.snap
@@ -45,8 +45,8 @@ exports[`test doesn't render family members if there are none 1`] = `
                 "value": "LastSixMonths",
               },
               Object {
-                "label": "Last Year",
-                "value": "LastYear",
+                "label": "Year To Date",
+                "value": "YearToDate",
               },
               Object {
                 "label": "All Time",
@@ -199,8 +199,8 @@ exports[`test renders family members when expanded is true 1`] = `
                 "value": "LastSixMonths",
               },
               Object {
-                "label": "Last Year",
-                "value": "LastYear",
+                "label": "Year To Date",
+                "value": "YearToDate",
               },
               Object {
                 "label": "All Time",
@@ -381,8 +381,8 @@ exports[`test works with nickname 1`] = `
                 "value": "LastSixMonths",
               },
               Object {
-                "label": "Last Year",
-                "value": "LastYear",
+                "label": "Year To Date",
+                "value": "YearToDate",
               },
               Object {
                 "label": "All Time",
diff --git a/imports/pages/give/history/index.js b/imports/pages/give/history/index.js
index 85c9a55db..d0c77312c 100644
--- a/imports/pages/give/history/index.js
+++ b/imports/pages/give/history/index.js
@@ -55,7 +55,7 @@ class TemplateWithoutData extends Component {
       .then(({ data: { transactionStatement } }) => {
         const blob = base64ToBlob(transactionStatement.file);
         this.setState({ printLoading: false });
-        fileSaver.saveAs(blob, `${moment().year()} NewSpring Church Giving Summary`);
+        fileSaver.saveAs(blob, `${moment().year()} NewSpring Church Giving Summary.pdf`);
       })
       .catch(() => {
         this.setState({ printLoading: false });
diff --git a/imports/pages/give/home/Activity.js b/imports/pages/give/home/Activity.js
index d47dab3bc..8a0f498df 100644
--- a/imports/pages/give/home/Activity.js
+++ b/imports/pages/give/home/Activity.js
@@ -87,14 +87,14 @@ export class GivingActivity extends Component {
 
     if ((transaction.status === null || transaction.status === "Success" || transaction.status === "Complete") && transaction.details.length) {
       status = "success";
-      linkText = "View Gift";
+      linkText = "View Contribution";
       linkUrl = `/give/history/${transaction.id}`;
       message = (
         <p>
-          Your {scheduled ? "scheduled " : ""}gift of <strong>${amount} </strong>
+          Your {scheduled ? "scheduled " : ""}contribution of <strong>${amount} </strong>
           to <strong>{transaction.details[0].account.name} </strong>
           {transaction.details.length > 1 ? this.additionalAmount(transaction.details[1]) : null}
-          was successful.
+          {" "}was successful.
         </p>
       );
     } else if (transaction.status === "Failed") {
@@ -105,7 +105,7 @@ export class GivingActivity extends Component {
           <strong> {transaction.details[0].account.name} </strong>
           {transaction.details.length > 1
             ? <span>and<strong> {transaction.details[1].name} </strong></span> : null}
-          was unsuccessful.
+          {" "}was unsuccessful.
           {transaction.statusMessage !== null && transaction.statusMessage !== ""
             ? ` Unfortunately, ${transaction.statusMessage}.` : ""}
         </p>
@@ -118,7 +118,7 @@ export class GivingActivity extends Component {
           <strong> {transaction.details[0].account.name} </strong>
           {transaction.details.length > 1
             ? <span>and<strong> {transaction.details[1].name} </strong></span> : null}
-          is <strong>pending</strong>.
+          {" "}is <strong>pending</strong>.
         </p>
       );
     } else {
diff --git a/imports/pages/give/home/Schedules.js b/imports/pages/give/home/Schedules.js
index 2618000a2..000db72b7 100644
--- a/imports/pages/give/home/Schedules.js
+++ b/imports/pages/give/home/Schedules.js
@@ -30,7 +30,7 @@ export class SchedulesList extends Component {
       <ScheduleCard
         classes="grid__item one-whole"
         key={schedule.id}
-        amount={`${schedule.details[0].amount}`}
+        amount={schedule.details.reduce((i, { amount }) => i + amount, 0).toFixed(2)}
         fund={schedule.details[0].account.name}
         frequency={schedule.schedule.description}
         started={schedule.start}
diff --git a/imports/pages/give/home/__tests__/__snapshots__/Schedules.js.snap b/imports/pages/give/home/__tests__/__snapshots__/Schedules.js.snap
index 3f3f04ac5..d0e2f14ff 100644
--- a/imports/pages/give/home/__tests__/__snapshots__/Schedules.js.snap
+++ b/imports/pages/give/home/__tests__/__snapshots__/Schedules.js.snap
@@ -112,7 +112,7 @@ exports[`Giving Schedules List should render properly with data 1`] = `
     <div
       className="grid">
       <ScheduleOverviewCard
-        amount="20"
+        amount="20.00"
         classes="grid__item one-whole"
         frequency="One Time"
         fund="General Fund"
@@ -127,7 +127,7 @@ exports[`Giving Schedules List should render properly with data 1`] = `
             <div
               className="card__item soft push-half-ends one-whole">
               <Currency
-                amount="20"
+                amount="20.00"
                 baseHeadingSize="1"
                 className="text-left">
                 <div
@@ -216,7 +216,7 @@ exports[`Giving Schedules List should render properly with data 1`] = `
         </div>
       </ScheduleOverviewCard>
       <ScheduleOverviewCard
-        amount="100"
+        amount="100.00"
         classes="grid__item one-whole"
         frequency="Once a Month"
         fund="Step Up Fund"
@@ -231,7 +231,7 @@ exports[`Giving Schedules List should render properly with data 1`] = `
             <div
               className="card__item soft push-half-ends one-whole">
               <Currency
-                amount="100"
+                amount="100.00"
                 baseHeadingSize="1"
                 className="text-left">
                 <div
@@ -320,7 +320,7 @@ exports[`Giving Schedules List should render properly with data 1`] = `
         </div>
       </ScheduleOverviewCard>
       <ScheduleOverviewCard
-        amount="50"
+        amount="50.00"
         classes="grid__item one-whole"
         frequency="One Time"
         fund="Christmas Offering"
@@ -335,7 +335,7 @@ exports[`Giving Schedules List should render properly with data 1`] = `
             <div
               className="card__item soft push-half-ends one-whole">
               <Currency
-                amount="50"
+                amount="50.00"
                 baseHeadingSize="1"
                 className="text-left">
                 <div
diff --git a/imports/pages/give/home/givingSummaryEnhancer.js b/imports/pages/give/home/givingSummaryEnhancer.js
index 1d07b9eea..f364c6478 100644
--- a/imports/pages/give/home/givingSummaryEnhancer.js
+++ b/imports/pages/give/home/givingSummaryEnhancer.js
@@ -95,6 +95,6 @@ const withData = graphql(YTD_QUERY, {
 
 const authorized = () => ({ authorized: Meteor.userId() });
 // eslint-disable-next-line
-export default (component: React$Component<any, any, any>) => (
+export default (component: React$Component<any, any, any> | Function) => (
   createContainer(authorized, withData(component))
 );
diff --git a/imports/pages/give/schedules/Details/Layout.js b/imports/pages/give/schedules/Details/Layout.js
index 1a40181c0..d2120127e 100644
--- a/imports/pages/give/schedules/Details/Layout.js
+++ b/imports/pages/give/schedules/Details/Layout.js
@@ -138,7 +138,7 @@ export default ({
           {schedule && (
             <div className="soft-top">
               {schedule.details.map(({ amount, account: { name } }, i) => (
-                <div className="floating one-whole" key={i}>
+                <div className="floating one-whole display-inline-block" key={i}>
                   <div className="floating__item float-left">
                     <h4 className="hard text-dark-primary">{name}</h4>
                   </div>
diff --git a/imports/pages/give/schedules/Details/__tests__/__snapshots__/Layout.js.snap b/imports/pages/give/schedules/Details/__tests__/__snapshots__/Layout.js.snap
index 7636c0fb3..2340b21e2 100644
--- a/imports/pages/give/schedules/Details/__tests__/__snapshots__/Layout.js.snap
+++ b/imports/pages/give/schedules/Details/__tests__/__snapshots__/Layout.js.snap
@@ -58,7 +58,7 @@ exports[`test renders complete message 1`] = `
         <div
           className="soft-top">
           <div
-            className="floating one-whole">
+            className="floating one-whole display-inline-block">
             <div
               className="floating__item float-left">
               <h4
@@ -277,7 +277,7 @@ exports[`test renders loading if no entries 1`] = `
         <div
           className="soft-top">
           <div
-            className="floating one-whole">
+            className="floating one-whole display-inline-block">
             <div
               className="floating__item float-left">
               <h4
@@ -573,7 +573,7 @@ exports[`test renders loading if not ready 1`] = `
         <div
           className="soft-top">
           <div
-            className="floating one-whole">
+            className="floating one-whole display-inline-block">
             <div
               className="floating__item float-left">
               <h4
@@ -793,7 +793,7 @@ exports[`test renders no contributions message 1`] = `
         <div
           className="soft-top">
           <div
-            className="floating one-whole">
+            className="floating one-whole display-inline-block">
             <div
               className="floating__item float-left">
               <h4
@@ -994,7 +994,7 @@ exports[`test renders stopped message 1`] = `
         <div
           className="soft-top">
           <div
-            className="floating one-whole">
+            className="floating one-whole display-inline-block">
             <div
               className="floating__item float-left">
               <h4
@@ -1213,7 +1213,7 @@ exports[`test renders with props 1`] = `
         <div
           className="soft-top">
           <div
-            className="floating one-whole">
+            className="floating one-whole display-inline-block">
             <div
               className="floating__item float-left">
               <h4
@@ -1548,7 +1548,7 @@ exports[`test renders without schedule payment 1`] = `
         <div
           className="soft-top">
           <div
-            className="floating one-whole">
+            className="floating one-whole display-inline-block">
             <div
               className="floating__item float-left">
               <h4
@@ -1768,7 +1768,7 @@ exports[`test works with credit card 1`] = `
         <div
           className="soft-top">
           <div
-            className="floating one-whole">
+            className="floating one-whole display-inline-block">
             <div
               className="floating__item float-left">
               <h4
diff --git a/imports/pages/profile/settings/Menu/__tests__/__snapshots__/index.js.snap b/imports/pages/profile/settings/Menu/__tests__/__snapshots__/index.js.snap
index ebadb67ca..b70a6f402 100644
--- a/imports/pages/profile/settings/Menu/__tests__/__snapshots__/index.js.snap
+++ b/imports/pages/profile/settings/Menu/__tests__/__snapshots__/index.js.snap
@@ -153,7 +153,7 @@ exports[`Menu renders with props 1`] = `
           className="plain text-dark-secondary"
           onlyActiveOnIndex={false}
           style={Object {}}
-          to="/profile/settings/saved-accounts">
+          to="/give/home#saved-payments">
           <RenderCell
             name="Saved Accounts" />
         </Link>
diff --git a/imports/pages/profile/settings/Menu/index.js b/imports/pages/profile/settings/Menu/index.js
index 81ea8cd4f..2c4eb02ae 100644
--- a/imports/pages/profile/settings/Menu/index.js
+++ b/imports/pages/profile/settings/Menu/index.js
@@ -204,7 +204,7 @@ class MenuWithoutData extends Component {
 
           <div className={this.dividerClasses()}>
             <div className={this.outlineClasses()} style={{ borderLeft: 0, borderRight: 0 }}>
-              <Link to="/profile/settings/saved-accounts" className="plain text-dark-secondary">
+              <Link to="/give/home#saved-payments" className="plain text-dark-secondary">
                 <RenderCell name="Saved Accounts" />
               </Link>
               <Link to="/give/schedules" className="plain text-dark-secondary">
diff --git a/imports/pages/studies/entry/index.js b/imports/pages/studies/entry/index.js
index 2519f82a7..3e5e96a78 100644
--- a/imports/pages/studies/entry/index.js
+++ b/imports/pages/studies/entry/index.js
@@ -82,6 +82,7 @@ class StudyEntrySingle extends Component {
 
   componentWillUnmount() {
     if (process.env.WEB) return;
+    this.props.dispatch(headerActions.set({ fontWeight: null }));
     this.props.dispatch(liveActions.unfloat());
   }
 
diff --git a/imports/store/give/reducer/transactions.js b/imports/store/give/reducer/transactions.js
index 38d62828a..79c725f7e 100644
--- a/imports/store/give/reducer/transactions.js
+++ b/imports/store/give/reducer/transactions.js
@@ -6,7 +6,10 @@ const addTransaction = (state, action) => {
 
   // eslint-disable-next-line no-restricted-syntax
   for (const fund in mergedTransactions) {
-    if (typeof mergedTransactions[fund].value !== "number") {
+    if (
+      typeof mergedTransactions[fund].value !== "number" ||
+      mergedTransactions[fund].value <= 0
+    ) {
       delete mergedTransactions[fund];
       // eslint-disable-next-line
       continue;
@@ -35,7 +38,10 @@ const clearTransaction = (state, action) => {
 
   // eslint-disable-next-line no-restricted-syntax
   for (const fund in state.transactions) {
-    if (typeof state.transactions[fund].value !== "number") {
+    if (
+      typeof state.transactions[fund].value !== "number" ||
+      state.transactions[fund].value <= 0
+    ) {
       // eslint-disable-next-line no-param-reassign
       delete state.transactions[fund];
       // eslint-disable-next-line