new ui integrated
clean up
clean up
clean up
Merge pull request #11 from eklavya/master

New UI integrated