Merge pull request #34 from stecd/design_content

Design content
content styling
styled edit content
styled show content
touch-ups show content