adding sample and edit profile, also added search to all pages
fixed merge conflicts