working on fixing pages
fixing cont.
fixed edit page