Several more refactorings and the ability to show/hide breakdowns.