Wip/week view fixes