fix header, fix week rows