More minor changes to ButtonPanel and TestButton, should be ready for delivery