Fixed base data
Fixed edit view to match add view
Fixed dispaly view to match add view