Windows fixes - addresses an embarrassing infinite loop
Minor HTML and UI touchups