Some formatting changes, HTTPS image fix, and more general cleanup