Added some basic UI, updated search queries