Fix display and saving