Fixed various HTML bugs