Changes for better display
error changes
Merge remote-tracking branch 'origin/master' into neha