search and navigator now share more HTML

this is preparation for consolidating the controllers backing them