UI Changes
Bug fix
Code optimizations
Merge pull request #95 from mshamash/master

Minor Changes + Fixes