LPS-34950 Port search inputs to be inside nav-bar
LPS-34950 remove an unnecessary level of markup