refactoring and adding search page
updating stuff and all that