Background drawing refactor
Fix a regression in styling
Calculator

Make the internal rect private