implemented generic toolbar; restructured search