More edit page improvements