Improve save behaviour and display
1.1.25