Bug fixes, laying builder framework for shift date functionality on third screen