Moved advanced and help links into search area and applied treatment

From #7