Improving weeks navigation