display tags and content properly
add some style
merge to master