Fixed indentation and XHTML errors