Menu and layout fixes.#2829
Secondary nav and search.#2819
Search block edits.#2819