Added search bar and options saving