Merge pull request #7 from ianring/master

UI improvements to the "choose your content" panel
Merge pull request #8 from ianring/master

changing "custom" to "ad hoc"