Fixed create-edit view