Changed html/css structure, added html entity names