Improved settings layout