Edit page improvements