Added content.
Fixed some css.
Fixed merge conflict.