optimise page improvements