Fixed final html issues