Reworking search screen to have separate toolbars