HTML fixes cont