Add actual display of numbers
Fix dodginess with orientation