Merge "Initial changes to add search bar."