Fixe some GS and add all CI Screens