Tweaking UI to make cleaner/more accurate. Add ComputerName as field