Added separate search page
code cleanup