Move dataselection part under the model selection

further height optimization