Resolve saving issues
correction display issues