Added and modified placeholders and forms.
Merge pull request #94 from jloehman/mallory

Added and modified placeholders and forms.