New layout for criterias

New layout for criterias
change some views to add tabs and reorganise the criteria view