fix #99 and #100. Also minor fixes in HTML for VM view