Fix new year and week start
Fix view