Angela added endButton with event handlers