fix header
show delete link if record not submitted
merge with dev
merge with stage