style update
Merged updated branch
Finished search pages
Merging