Added UI patch from nikhil.
Merge pull request #5 from tripples/ui

Added UI patch from nikhil.