Revert "Changes in Storage, Main Activity and strings"

This reverts commit 14194de2c8ab93497162ce99f5e3a96413a20fd8.