Revert "Revert "LCD Changes and 5.0.1""

This reverts commit b0d3cd8f879d87745c17aec6618fcc936e5940ce.