Added html tags and classes