Various HTML fixes