Fixes to address bug 119
In process for fixing #138
In process for fixing #138
In process for fixing #138
Merge pull request #136 from readywater/frontend-fix

Fixes to address bug 119 + 138 
Thanks to @readywater for the fixes!