fix FE HTML issues