NXP-14978: Display labels before add button when added
NXP-14981: Display add buttons as buttons