Fix week listing & move current week code in mixin.