add some buttons and fixes