Split checkbox input and label in one line

Change-Id: I68576607cd4d34743f7b12c3ed6f50aaf631d961