re-organize create screen and add clue modal