Added better search bar