[Priti] : Fixed bugs with UI rendering of Block Display
Merge branch 'master' into release_0.3.3