added checkboxes pictures, refactoring of the code