fix html special character problem, some tweaks on UI layout as well