optimse page improvements