UX improvments, fix HTML entities