Add a page for search
Refactor structure
Refactor