Improved Edit page and added page headers