Data page improvements