Added markup
Added emoticons