Revert "Revert "Text/Menu formatting updates""

This reverts commit 7f36f62828e6fcc5fa140e411894bd24752cef30.