Better button event handler handling and a tiny change in materials & rendering.