modifiy editpage better