Finish modal changes and add plan date button