Minor updates to design (move some stuff around)
Merge branch 'master' of https://github.com/Discover-/File-Searcher