ref #8011 Layout improvements
ref #8011 Add search button to term search
ref #8011 Some layouting
ref #8011 Refactored package structure