UI experiements
added index for saving
refactored saver
refactoring
remove duplication save/restore