Working on theme and layout.  Also removed/added some content.