merged edit and select, made select and game more compact with new icons