Refactored Pi Display