added buttons for search
fixing conflicts