@christianv , yeah, it's a tough call. I started by trying to keep both flavors of grade-table in a single div. But they differ in their header, in their handling of the Grade column, and in their explanatory texts, so it started to get pretty hairy. The GPA Calculator template-plus-controller is already hefty enough to feel like a separate widget, but I didn't want to delay the UX fix to tackle that level of refactoring. Probably the easiest way to DRY it up would be to shove some of this template logic down into the controller, which is already massive… How about I sleep on it & we talk tomorrow morning if you're available?