Add labels and expand handle section