adding some content; cleaning up styles
merge