Fixed issue with data. Added day/week view switching