HTML Cleanup

Cleaned up remaining HTML