Fixing issue #105
Updating UX Mock ups.