Add search page
Refactor code
Merge branch 'feature/search' into develop