Move searchbar to a separate file
Fix return and closing parens