Fix review comments - tidy html