More minor HTML cleanup