Merge pull request #31 from Magenic/master

Updating local fork.
Fixing issue #105
Updating UX Mock ups.
Merge pull request #112 from jwendl/master

Updating UX Mock ups