Change html markup style
Add unicorn
Commit fixed changes from merge