More buttons, and systematic use of fallback.