Updates UI and adds functionality to match
Merge pull request #3 from jgoley/jonathan

Updates UI and adds functionality to match