Fixed saving bugs and added error message to modal
disted