Money you know you'll need (or could possibly need) within the next 5 years should only be kept in a HISA (High Interest Savings Account) and should not be "invested"
Where is your savings account currently and what interest rate are you getting on it? If you haven't already, I would suggest you set up an account at EQ Bank. I've been with them for years and would highly recommend them! Their interest rates are consistently the highest, currently @ 1.25%. Most banks pay 0.05-0.1%. Their accounts are all free with no minimum balance requirements. Everything's free including unlimited transactions/bill payments/e-Transfers. You can easily link your accounts at other banks and transfer large sums of money back and forth for free. Their website and app are great. And their customer service is top notch!