Moved search to page and more