Updated search block styling and mockup to match drupal output
Fixed merge conflict