refactor
fixed conflicts
improve search page
improve search