fix save draft and add tooltip icon