Changed data model of LocalStorage, refactored app due to this change