Added checkbox and remove icons.