Average: Redesign for BTTF

Fix for #401
Merge pull request #425 from duckduckgo/jag/bttf/average

Average: Redesign for BTTF