Remove redundant code
Move all search elements to own view
Improve components structure