Revert "Revert "Changes in Storage, Main Activity and strings""

This reverts commit 2dd30cf20bdd82d81cede7f7147aab96f349465c.