Correct dependencies and html cleanup