Reorganise label display #39