Improved settings menu