Maybe we should re-think the buttons on the viewfinder screen, then? We obviously need a shutter button for the current shooting mode, but maybe the other icon should be a "Shooting Mode" button instead of just the opposite mode that you are currently in (since there are 3 now...)? So, you are in the camera, then you hit the "Shooting Mode" button to decide if you want a timer or video. Clicking on the video button isn't the most intuitive for a camera mode. This would also allow a place for burst capture, time lapse, etc if you ever wanted to add those features.