Clean up unneded includes and fix logic for display output to include fitscreen text