Merge "UI: Fix broken html literals"