Finder facelift

Attach listeners implementation. Removes old lines.
Merge pull request #175 from miroslavhajek/feature/vp-57-finder

Finder facelift