Better error handling and initial stats view redesign