index & edit page issues fixed