Fixed a few bugs and got the feedback modal up to date with our model.
Merge pull request #94 from Jedwondle/master

Fixed a few bugs and got the feedback modal up to date with our model.