Refactor search nav and results into own controllers.

Change-Id: I5edbfd22aebd4429c0d8242e4335ce43f2f3e643