fixed some minor bugs
fixed some design issue
Merge pull request #199 from ritesharora89/mybranch

Mybranch