Include window area in the statistics

As a whole and room by room