Major toilet and washroom fit out programme nears completion