Layout labels

Change-Id: I880975c0b8f9c2ecb2278d2526f6d3dc1aa9ae39