New screens added and multiple select working