Updates for log file display
Merge branches 'master' and 'skelupdate'

* master:

* skelupdate:
  Updates for log file display