Edit changes based on A8 Lab Test evaluation. Left minor UI changes by
Raf.