Fixed button behaviors and draftlist