UI Changes implemented + null handling implemented.
Merge pull request #1654 from ssushma/dev-branch

UI Changes implemented + null handling implemented.