Final customer and page fixes