Attempt on cleaning empty dirs
corrected search settings screen
Merge pull request #105 from mozvip/development

Development