Settings page improved