Broken: Updating things for new WS.
Updated search button
Some stuff to make things better, but don't know untill @cjrobins58 looks at it.