added buttons and tables