Fixed week date picker bug having 2 days and other bugs