more work on buttons