Layout labels

Change-Id: I3f42b6c2070083f939ed8e434131518a48b3ac30