Added buttons and labels