Added code, bootstrap modal,... to add new criterions
Some modifications (clean and convention)