Refactored Storage related stuff

Help alert shows automatically on first-run