Refactoring, and download layout alignment fixes
Refactor download prefs, when to d/l over internet
Issues with Dagger and Android Annotations, broken