Move checkbox to get better layout