Fixed some tabbing, added pop up dialogs in case of save error