Revert "Adding Command-T and reorganizing settings."

This reverts commit 4ebb6c11ddf909510dfc3a3335f1a4e48e27ba57.