perf page improvements
perf page improvements