Task #51 completed

And few changes in UI made