Incriment week label and fix trimming for items not in the range