General update

Added check for unsaved data, improved user-friendlienss