fix warnings

Change-Id: I3e45922aa6bc2bbd1db99025a5dde9670247501b
try to improve the rendering

Change-Id: I873e56c28228e24c9d26419a013f358548873931