Get rid of the search for view, also fix flimsy naming of components (must remove that)