draft modal fixes