Added persistance to the checkmarks (if enabled)