Added search bar and fixed a couple other things