Save date fix and 3rd tab fix