created pages for basic and advanced search, navbar template
fixed routes
removed merge conflicts from routes
Revert "fixed routes"

This reverts commit 9209f66bce6e3aeb1f411031a77f6dba247cd951.