More progress on user week view
More progress