Further indents and add missing body tag