Improved order of items in settings page