Improved the settings menu
Revert "Improved the settings menu"

This reverts commit dc94a71eb42fa21500d47dc90175d3b58e553d48.
Revert "Revert "Improved the settings menu""

This reverts commit 6bcf1e324434c3ebd2c4f4e4d761e343ebddc68d.