Improved rendering

Change-Id: Ife7530525f39405cc6499f1ab12e3d215c3ea4f9