checkpoint - added + button and expand/collapse