Made select screens better