Revert "Text/Menu formatting updates"

This reverts commit 5d746dcb8443fc6f97624bdff22c2ae46bf22779.