Improve total weeks table