fix date issue, add cleanup html