Fix Searchbar and other random things