Properly saving now, some UI improvements