Feature 28 edit view update

at your earliest convince for next iteration...