I agree with these choices. The addition of a global choice (as mentioned above) would be ideal, especially when using a rotated template.