Select 2 Updated and changed according to general design