improve model DOM structure