Added new buttons and labels