Added search
UI stuff