Working on Add Risk screen