Change HTML formatting library and small fixes