Update content
Style tweaks and content update
Merge html