Would moving override button provide better usability?

I think that moving the override button down into the area of the update/cancel/remove might improve usability. It seems that you can easily forget to override and then accidentally update the default display.

Or, you make a bunch of changes to a view, then realize if you save it you'll update the default, but when you cancel you have to do them all over again.

It might help usability to have the override button in the same area as the update button so you know which one you are about to update. Or, at the least, I think showing the override status in that area would be helpful.

Perhaps the update button text could even change dynamically: "Update default" or "Update override." Or, have a box behind them that was labeled like a fieldset, etc.