Html update, some fixes