Added week tags as well as collapse