added extra buttons and stubs