working delete button
update button fixed
edited show page and resolved conflicts