Moved search bar and buttons refs #21413