Remove unneeded view
Refactor search view
Fixes #171, #168.