Adding Search - extensive layout and include changes