Finder facelift

Attach listeners implementation. Removes old lines.